Skip to content

Commit f145f1d

Browse files
authored
update cypress (#3736)
* update cypress * revert ide updates * Update package.json * update prettier * test fail case * update snapshot path * revert fails * Update package.json * update imge path * update typo
1 parent 7840231 commit f145f1d

File tree

97 files changed

+33
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+33
-12
lines changed

venia-integration-tests/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
node_modules
22
.DS_Store
33
.idea
4-
/src/snapshots/integrationTests/pageBuilder/**/__diff_output__/
4+
/src/snapshots/snapshotTests/**/**/__diff_output__/
55
cypress/results/*
66
cypress-test-results.json

venia-integration-tests/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
"posttest:headless": "./report-results.js",
99
"test": "cypress open --browser chrome --config-file cypress.config.json",
1010
"test:ci": "./run-tests.js -t 4",
11+
"test:ci:functional": "FunctionalTests=true ./run-tests.js -t 6",
12+
"test:ci:snapshot": "SanpshotTests=true ./run-tests.js -t 4",
1113
"test:debug": "node --inspect-brk ./node_modules/cypress/bin/cypress run --browser chrome --config-file cypress.config.json",
1214
"test:devTest": "jest",
1315
"test:firefox": "cypress open --browser firefox --config-file cypress.config.json",

venia-integration-tests/run-tests.js

+20-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,26 @@ if (!baseUrl) {
4949
process.exit(1);
5050
}
5151

52-
const files = spec ? spec.split(',') : glob.sync('./src/tests/**/*.spec.js');
52+
let files = null;
53+
54+
if (process.env.FunctionalTests) {
55+
files = spec
56+
? spec.split(',')
57+
: glob.sync('./src/tests/**/*.spec.js', {
58+
ignore: ['./src/tests/snapshotTests/**/*']
59+
});
60+
} else if (process.env.SanpshotTests) {
61+
files = spec
62+
? spec.split(',')
63+
: glob.sync('./src/tests/**/*.spec.js', {
64+
ignore: [
65+
'./src/tests/e2eTests/**/*',
66+
'./src/tests/integrationTests/**/*'
67+
]
68+
});
69+
} else {
70+
files = spec ? spec.split(',') : glob.sync('./src/tests/**/*.spec.js');
71+
}
5372

5473
const threadCount = Math.min(files.length, threads);
5574
const testsPerRun = files.length / threadCount;

venia-integration-tests/src/fixtures/pageBuilder/banner/banner6.json

+1-1
Large diffs are not rendered by default.

venia-integration-tests/src/fixtures/pageBuilder/banner/banner7.json

+1-1
Large diffs are not rendered by default.

venia-integration-tests/src/fixtures/pageBuilder/banner/banner8.json

+1-1
Large diffs are not rendered by default.

venia-integration-tests/src/fixtures/pageBuilder/banner/banner9.json

+1-1
Large diffs are not rendered by default.

venia-integration-tests/src/fixtures/pageBuilder/slider/slider10.json

+1-1
Large diffs are not rendered by default.

venia-integration-tests/src/fixtures/pageBuilder/slider/slider11.json

+1-1
Large diffs are not rendered by default.

venia-integration-tests/src/fixtures/pageBuilder/slider/slider3.json

+1-1
Large diffs are not rendered by default.

venia-integration-tests/src/fixtures/pageBuilder/slider/slider4.json

+1-1
Large diffs are not rendered by default.

venia-integration-tests/src/fixtures/pageBuilder/slider/slider5.json

+1-1
Large diffs are not rendered by default.

venia-integration-tests/src/fixtures/pageBuilder/slider/slider6.json

+1-1
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)