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:11:17 +01:00
parent 7e32a16969
commit 6518cd464c
7 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cypress/integration/boardFeatures.js
View File

@@ -14,11 +14,16 @@ describe('Board', function () {
it('Can create a board', function () {
let board = 'Test'
cy.intercept({
method: 'POST',
url: '/index.php/apps/deck/boards',
}).as('createBoardRequest')
// 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(3).find('a').first().click({force: true})
// Type the board title
cy.get('.board-create form input[type=text]')
@@ -27,8 +32,10 @@ describe('Board', function () {
// Submit
cy.get('.board-create form input[type=submit]')
.first().click({force: true})
cy.wait('@createBoardRequest').its('response.statusCode').should('equal', 200)
cy.get('.app-navigation__list .app-navigation-entry__children .app-navigation-entry')
.first().contains(board).should('be.visible')
.contains(board).should('be.visible')
})
})

2
cypress/integration/cardFeatures.js
View File

@@ -21,7 +21,7 @@ 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')
.eq(3).find('a.app-navigation-entry-link')
.first().click({force: true})
cy.get('.board .stack').eq(0).within(() => {

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

4
cypress/integration/stackFeatures.js
View File

@@ -20,8 +20,8 @@ describe('Stack', 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')
.eq(3)
.find('a.app-navigation-entry-link')
.first().click({force: true})
cy.get('#stack-add button').first().click()

9
cypress/support/commands.js
View File

@@ -82,7 +82,7 @@
cy.get('.app-navigation button.app-navigation-toggle').click()
cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
.eq(1)
.eq(3)
.find('a')
.first()
.click({force: true})
@@ -100,8 +100,8 @@
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')
.eq(3)
.find('a.app-navigation-entry-link')
.first()
.click({force: true})
@@ -111,5 +111,4 @@
cy.get('#stack-add form input[type=submit]')
.first()
.click()
})
})