fix: resolve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
This commit is contained in:
Luka Trovic
2022-05-09 12:07:02 +01:00
parent a4bbf8f233
commit 3ce8041a12
12 changed files with 26 additions and 26 deletions

View File

@@ -21,10 +21,8 @@ describe('Card', function () {
cy.get('.app-navigation button.app-navigation-toggle').click()
cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
.eq(1)
.find('.app-navigation-entry__children .app-navigation-entry a.app-navigation-entry-link')
.first()
.click({force: true})
.eq(1).find('.app-navigation-entry__children .app-navigation-entry a.app-navigation-entry-link')
.first().click({force: true})
cy.get('.board .stack').eq(0).within(() => {
cy.get('button.action-item.action-item--single.icon-add')