From 3ce8041a12948786a959efd7aa7f811b54e3267c Mon Sep 17 00:00:00 2001 From: Luka Trovic Date: Mon, 9 May 2022 12:07:02 +0100 Subject: [PATCH] fix: resolve merge conflicts Signed-off-by: Luka Trovic --- .github/workflows/cypress.yml | 6 +++--- cypress/integration/boardFeatures.js | 12 +++--------- cypress/integration/cardFeatures.js | 6 ++---- cypress/integration/deckDashboard.js | 3 +-- package.json | 9 ++++++++- src/components/board/Board.vue | 4 ++-- src/components/board/Stack.vue | 2 +- src/components/card/CardSidebar.vue | 4 ++-- src/components/card/Description.vue | 1 + src/components/cards/CardItem.vue | 1 + src/components/search/GlobalSearchResults.vue | 2 +- src/components/search/Placeholder.vue | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index c72fdea2c..4fc50977c 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Setup custom host for nextcloud - run: echo "127.0.0.1 nextcloud.local" | sudo tee -a /etc/hosts + run: echo "localhost nextcloud.local" | sudo tee -a /etc/hosts - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 @@ -73,13 +73,13 @@ jobs: php occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu" php occ config:system:set debug --value=true --type=boolean php -f index.php - php -S 0.0.0.0:8081 & + php -S 0.0.0.0:80 & export OC_PASS=1234561 php occ user:add --password-from-env user1 php occ user:add --password-from-env user2 php occ app:enable deck php occ app:list - curl -v http://localhost:8081/index.php/login + curl -v http://localhost/index.php/login cat data/nextcloud.log - name: Cypress run diff --git a/cypress/integration/boardFeatures.js b/cypress/integration/boardFeatures.js index 44a70a181..c47fe3730 100644 --- a/cypress/integration/boardFeatures.js +++ b/cypress/integration/boardFeatures.js @@ -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') }) }) \ No newline at end of file diff --git a/cypress/integration/cardFeatures.js b/cypress/integration/cardFeatures.js index 3d04bf6d3..e8a772ed7 100644 --- a/cypress/integration/cardFeatures.js +++ b/cypress/integration/cardFeatures.js @@ -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') diff --git a/cypress/integration/deckDashboard.js b/cypress/integration/deckDashboard.js index b024778f4..08f98866f 100644 --- a/cypress/integration/deckDashboard.js +++ b/cypress/integration/deckDashboard.js @@ -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') }) diff --git a/package.json b/package.json index 511e14613..f67215e64 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,14 @@ "@vue/test-utils": "^1.3.0", "jest": "^28.1.0", "jest-serializer-vue": "^2.0.2", - "vue-jest": "^3.0.7" + "node-polyfill-webpack-plugin": "^1.1.4", + "postcss-html": "^1.4.1", + "stylelint": "^14.7.1", + "stylelint-config-recommended-scss": "^6.0.0", + "stylelint-config-recommended-vue": "^1.4.0", + "stylelint-webpack-plugin": "^3.2.0", + "vue-jest": "^3.0.7", + "webpack": "^5.72.0" }, "jest": { "moduleFileExtensions": [ diff --git a/src/components/board/Board.vue b/src/components/board/Board.vue index 425af1dee..d29570ce3 100644 --- a/src/components/board/Board.vue +++ b/src/components/board/Board.vue @@ -163,8 +163,8 @@ export default {