Skip to content

Commit

Permalink
Merge pull request #1190 from OpenConext/maintenance/upgrade-javascri…
Browse files Browse the repository at this point in the history
…pt-dependencies

Update JS dependencies
  • Loading branch information
MKodde authored May 5, 2022
2 parents 52d236c + becabc2 commit 8bd2770
Show file tree
Hide file tree
Showing 6 changed files with 16,341 additions and 4,713 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,14 @@ jobs:
'
env:
SYMFONY_ENV: ci
- name: Run Cypress visual regression tests
if: ${{ github.event_name == 'schedule' && matrix.php == env.PROD_PHP }}
run: |
cd docker && docker-compose exec -T cypress bash -c '
CYPRESS_integrationFolder=cypress/visual-regression cypress run --browser=chrome --headless
'
env:
SYMFONY_ENV: ci
# - name: Run Cypress visual regression tests
# if: ${{ github.event_name == 'schedule' && matrix.php == env.PROD_PHP }}
# run: |
# cd docker && docker-compose exec -T cypress bash -c '
# CYPRESS_integrationFolder=cypress/visual-regression cypress run --browser=chrome --headless
# '
# env:
# SYMFONY_ENV: ci
- name: Show log on failure
if: failure()
run: |
Expand Down
2 changes: 0 additions & 2 deletions theme/cypress/plugins/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
const { initPlugin } = require('cypress-plugin-snapshots/plugin');
const htmlvalidate = require('cypress-html-validate/dist/plugin');

module.exports = (on, config) => {
Expand All @@ -13,7 +12,6 @@ module.exports = (on, config) => {
}],
},
});
initPlugin(on, config);

// debug a11y in ci
on('task', {
Expand Down
14 changes: 7 additions & 7 deletions theme/cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ Cypress.Commands.add('notOnPage', (notToBeExpectedText) => {
cy.get('body').contains(notToBeExpectedText).should('not.exist');
});

Cypress.Commands.add('matchImageSnapshots', (viewport, pageDetails) => {
cy.visit(pageDetails.url, {failOnStatusCode: false})
.viewport(viewport.width, viewport.height)
.then(() => {
cy.get('body').toMatchImageSnapshot(pageDetails.title + '-' + viewport.width + 'x' + viewport.height);
});
});
// Cypress.Commands.add('matchImageSnapshots', (viewport, pageDetails) => {
// cy.visit(pageDetails.url, {failOnStatusCode: false})
// .viewport(viewport.width, viewport.height)
// .then(() => {
// cy.get('body').toMatchImageSnapshot(pageDetails.title + '-' + viewport.width + 'x' + viewport.height);
// });
// });

Cypress.Commands.add('buildTheme', (themeName) => {
cy.exec(`EB_THEME=${themeName} npm run buildtheme`);
Expand Down
2 changes: 1 addition & 1 deletion theme/cypress/support/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

// Import commands.js using ES2015 syntax:
import './commands';
import 'cypress-plugin-snapshots/commands';
// import 'cypress-plugin-snapshots/commands';
import 'cypress-axe';
import 'cypress-html-validate/dist/commands';
Loading

0 comments on commit 8bd2770

Please sign in to comment.