Merge branch 'develop' into PWA-2571

venia-integration-tests/.gitignore

@@ -1,6 +1,6 @@
 node_modules
 .DS_Store
 .idea
-/src/snapshots/integrationTests/pageBuilder/**/__diff_output__/
+/src/snapshots/snapshotTests/**/**/__diff_output__/
 cypress/results/*
 cypress-test-results.json

venia-integration-tests/package.json

@@ -8,6 +8,8 @@
     "posttest:headless": "./report-results.js",
     "test": "cypress open --browser chrome --config-file cypress.config.json",
     "test:ci": "./run-tests.js -t 4",
+    "test:ci:functional": "FunctionalTests=true ./run-tests.js -t 6",
+    "test:ci:snapshot": "SanpshotTests=true ./run-tests.js -t 4",
     "test:debug": "node --inspect-brk ./node_modules/cypress/bin/cypress run --browser chrome --config-file cypress.config.json",
     "test:devTest": "jest",
     "test:firefox": "cypress open --browser firefox --config-file cypress.config.json",

venia-integration-tests/run-tests.js

@@ -49,7 +49,26 @@ if (!baseUrl) {
     process.exit(1);
 }
 
-const files = spec ? spec.split(',') : glob.sync('./src/tests/**/*.spec.js');
+let files = null;
+
+if (process.env.FunctionalTests) {
+    files = spec
+        ? spec.split(',')
+        : glob.sync('./src/tests/**/*.spec.js', {
+              ignore: ['./src/tests/snapshotTests/**/*']
+          });
+} else if (process.env.SanpshotTests) {
+    files = spec
+        ? spec.split(',')
+        : glob.sync('./src/tests/**/*.spec.js', {
+              ignore: [
+                  './src/tests/e2eTests/**/*',
+                  './src/tests/integrationTests/**/*'
+              ]
+          });
+} else {
+    files = spec ? spec.split(',') : glob.sync('./src/tests/**/*.spec.js');
+}
 
 const threadCount = Math.min(files.length, threads);
 const testsPerRun = files.length / threadCount;