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

@@ -18,10 +18,7 @@ describe('Board', function () {
// Click "Add board"
cy.get('.app-navigation button.app-navigation-toggle').click()
cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
.eq(1)
.find('a')
.first()
.click({force: true})
.eq(1).find('a').first().click({force: true})
// Type the board title
cy.get('.board-create form input[type=text]')
@@ -29,12 +26,9 @@ describe('Board', function () {
// Submit
cy.get('.board-create form input[type=submit]')
.first()
.click({force: true})
.first().click({force: true})
cy.get('.app-navigation__list .app-navigation-entry__children .app-navigation-entry')
.first()
.contains(board)
.should('be.visible')
.first().contains(board).should('be.visible')
})
})