Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update JS dependencies #1190

Merged
merged 2 commits into from
May 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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