ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: resolve merge conflicts

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
cypress/integration/boardFeatures.js
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')
})
})

6
cypress/integration/cardFeatures.js
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')

3
cypress/integration/deckDashboard.js
View File

@@ -14,8 +14,7 @@ describe('Deck dashboard', function() {
it('Can show the right title on the dashboard', function() {
cy.get('.board-title h2')
.should('have.length', 1)
.first()
.should('have.length', 1).first()
.should('have.text', 'Upcoming cards')
})