Merge branch 'main' into 3.99

2021-04-22 17:23:08 -07:00
parent 8b3a6561b1 9555cb9842
commit fb05da1fc3
24 changed files with 504 additions and 100 deletions
--- a/spec/support/jasmine-browser.js
+++ b/spec/support/jasmine-browser.js
@@ -43,9 +43,7 @@ module.exports = {
      browserVersion: process.env.SAUCE_BROWSER_VERSION,
      build: `Core ${process.env.TRAVIS_BUILD_NUMBER || 'Ran locally'}`,
      tags: ['Jasmine-Core'],
-      tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER
-        ? process.env.TRAVIS_JOB_NUMBER.toString()
-        : null,
+      tunnelIdentifier: process.env.SAUCE_TUNNEL_IDENTIFIER,
      username: process.env.SAUCE_USERNAME,
      accessKey: process.env.SAUCE_ACCESS_KEY
    }
--- a/spec/support/jasmine.json
+++ b/spec/support/jasmine.json
@@ -17,6 +17,7 @@
    "helpers/integrationMatchers.js",
    "helpers/promises.js",
    "helpers/requireFastCheck.js",
+    "helpers/overrideConsoleLogForCircleCi.js",
    "helpers/nodeDefineJasmineUnderTest.js",
    "helpers/resetEnv.js"
  ],