fix: resolve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
This commit is contained in:
Luka Trovic
2022-05-09 12:11:17 +01:00
parent 7e32a16969
commit 6518cd464c
7 changed files with 37 additions and 23 deletions

View File

@@ -18,12 +18,16 @@ describe('Deck dashboard', function() {
.should('have.text', 'Upcoming cards')
})
/* it('Can see the default "Personal Board" created for user by default', function () {
cy.get('.app-navigation button.app-navigation-toggle')
.click()
it('Can see the default "Personal Board" created for user by default', function () {
const defaultBoard = 'Personal'
cy.get('.app-navigation button.app-navigation-toggle').click()
cy.get('.app-navigation__list .app-navigation-entry__children .app-navigation-entry')
cy.get('.app-navigation__list .app-navigation-entry')
.eq(1)
.find('ul.app-navigation-entry__children li.app-navigation-entry')
.first()
.contains('Personal')
}) */
})
.contains(defaultBoard)
.should('be.visible')
})
})