Merge branch '3.99' into 4.0

2021-05-18 17:12:29 -07:00
parent 1b97795684 3e2872a1df
commit 752441a66f
15 changed files with 470 additions and 155 deletions
--- a/spec/support/jasmine-browser.js
+++ b/spec/support/jasmine-browser.js
@@ -47,3 +47,7 @@ module.exports = {
    }
  }
 };
+
+if (process.env.SKIP_JASMINE_BROWSER_FLAKES === 'true') {
+  module.exports.helpers.push('helpers/disableBrowserFlakes.js');
+}