Merge branch 'main' into 3.99

2021-05-18 17:07:34 -07:00
parent 5504965bea 140225e7c3
commit 3e2872a1df
15 changed files with 465 additions and 150 deletions
--- a/spec/support/jasmine-browser.js
+++ b/spec/support/jasmine-browser.js
@@ -49,3 +49,7 @@ module.exports = {
    }
  }
 };
+
+if (process.env.SKIP_JASMINE_BROWSER_FLAKES === 'true') {
+  module.exports.helpers.push('helpers/disableBrowserFlakes.js');
+}