chore(#8706): split integration test job

.github/workflows/build.yml

@@ -97,7 +97,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cmd: ['ci-webdriver-standard', 'ci-e2e-integration', 'ci-webdriver-default-mobile']
+        cmd: ['ci-webdriver-standard', 'ci-integration-all', 'ci-integration-sentinel', 'ci-webdriver-default-mobile']
         chrome-version: ['90', 'latest']
         suite: [all]
         include:
@@ -112,7 +112,9 @@ jobs:
           - cmd: ci-webdriver-default
             suite: workflows
         exclude: # temporary until all suites run on Chrome 90
-          - cmd: ci-e2e-integration
+          - cmd: ci-integration-all
+            chrome-version: 90
+          - cmd: ci-integration-sentinel
             chrome-version: 90
           - cmd: ci-webdriver-default-mobile
             chrome-version: 90

package.json

@@ -46,7 +46,8 @@
     "-- CI SCRIPTS ": "-----------------------------------------------------------------------------------------------",
     "build": "./scripts/build/build-ci.sh",
     "ci-compile": "node scripts/ci/check-versions.js && node scripts/build/cli npmCiModules && npm run lint && npm run build && npm run integration-api && npm run unit",
-    "ci-e2e-integration": "mocha --config tests/integration/.mocharc.js",
+    "ci-integration-all": "mocha --config tests/integration/.mocharc-all.js",
+    "ci-integration-sentinel": "mocha --config tests/integration/.mocharc-sentinel.js",
     "ci-webdriver-default": "wdio run ./tests/e2e/default/wdio.conf.js",
     "ci-webdriver-default-mobile": "wdio run ./tests/e2e/default-mobile/wdio.conf.js",
     "ci-webdriver-standard": "wdio run ./tests/e2e/standard/wdio.conf.js",

tests/integration/.mocharc-all.js

@@ -0,0 +1,9 @@
+const baseConfig = require('./.mocharc-base');
+
+module.exports = {
+  ...baseConfig,
+  spec: [
+    'tests/integration/!(cht-conf|sentinel)/**/*.spec.js', // run everything except the sentinel tests - those are tested in .mocharc-sentinel.js
+    'tests/integration/cht-conf/**/*.spec.js', // Executing last to not side-effect sentinel tests.
+  ],
+};

tests/integration/.mocharc.js → tests/integration/.mocharc-base.js

@@ -13,8 +13,7 @@ module.exports = {
   fullTrace: true,
   asyncOnly: false,
   spec: [
-    'tests/integration/!(cht-conf)/**/*.spec.js',
-    'tests/integration/cht-conf/**/*.spec.js', // Executing last to not side-effect sentinel tests.
+    // extend this file and overwrite this property with the specs you want to run
   ],
   timeout: 200 * 1000, //API takes a little long to start up
   reporter: 'spec',

tests/integration/.mocharc-sentinel.js

@@ -0,0 +1,6 @@
+const baseConfig = require('./.mocharc-base');
+
+module.exports = {
+  ...baseConfig,
+  spec: [ 'tests/integration/sentinel/**/*.spec.js' ],
+};

tests/integration/api/controllers/all-docs.spec.js

@@ -299,7 +299,6 @@ describe('all_docs handler', () => {
         ))
       ]))
       .then(([excludeDocs, includeDocs]) => {
-        console.log(JSON.stringify(excludeDocs, null, 2));
         expect(excludeDocs.rows.map(row => row.id)).to.have.members(getIdsForUser('offline'));
         expect(includeDocs.rows.map(row => row.id)).to.have.members(getIdsForUser('offline'));
       });

tests/integration/api/controllers/db-doc.spec.js

@@ -786,7 +786,6 @@ describe('db-doc handler', () => {
               if (reportScenarios[idx].allowed) {
                 chai.expect(result).to.deep.include(reportScenarios[idx].doc);
               } else {
-                console.log(idx, result);
                 chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
               }
             });

tests/integration/infodocs/infodocs.spec.js

@@ -305,7 +305,6 @@ describe('infodocs', () => {
               assert.equal(infodoc.some, 'legacy data');
             });
         }).catch(err => {
-          console.log('OH NOOOOO', err);
           console.log(err);
           throw err;
         });