From 5327157832efacfefff8afbabfc04840f0c575cd Mon Sep 17 00:00:00 2001
From: Steve Gravrock <sdg@panix.com>
Date: Mon, 17 Jan 2022 14:54:21 -0800
Subject: [PATCH] Always run formerly flaky specs

---
 .circleci/config.yml                 | 19 -------------------
 spec/core/integration/EnvSpec.js     | 20 --------------------
 spec/helpers/disableBrowserFlakes.js |  7 -------
 spec/support/jasmine-browser.js      |  4 ----
 4 files changed, 50 deletions(-)
 delete mode 100644 spec/helpers/disableBrowserFlakes.js

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 81f57def..bdfa47ce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,8 +60,6 @@ jobs:
 
   test_browsers: &test_browsers
     executor: node14
-    environment:
-      SKIP_JASMINE_BROWSER_FLAKES: "true"
     steps:
       - attach_workspace:
           at: .
@@ -90,11 +88,6 @@ jobs:
             scripts/stop-sauce-connect $(cat sauce-pidfile)
             exit $exitcode
 
-  test_browser_flakes:
-    <<: *test_browsers
-    environment:
-      SKIP_JASMINE_BROWSER_FLAKES: "false"
-
 workflows:
   version: 2
 
@@ -138,15 +131,3 @@ workflows:
           filters:
             branches:
               ignore: /pull\/.*/ # Don't run on pull requests.
-
-  browser-flakes:
-    jobs:
-    - build:
-        executor: node14
-        name: build_node_14
-    - test_browser_flakes:
-        requires:
-        - build_node_14
-        filters:
-          branches:
-            ignore: /pull\/.*/ # Don't run on pull requests.
diff --git a/spec/core/integration/EnvSpec.js b/spec/core/integration/EnvSpec.js
index 14d9e759..ff20bb84 100644
--- a/spec/core/integration/EnvSpec.js
+++ b/spec/core/integration/EnvSpec.js
@@ -455,10 +455,6 @@ describe('Env integration', function() {
   });
 
   it('copes with async failures after done has been called', function(done) {
-    if (jasmine.getEnv().skipBrowserFlake) {
-      jasmine.getEnv().skipBrowserFlake();
-    }
-
     var global = {
       setTimeout: function(fn, delay) {
         return setTimeout(fn, delay);
@@ -1174,10 +1170,6 @@ describe('Env integration', function() {
   });
 
   it('Mock clock can be installed and used in tests', function(done) {
-    if (jasmine.getEnv().skipBrowserFlake) {
-      jasmine.getEnv().skipBrowserFlake();
-    }
-
     var globalSetTimeout = jasmine
         .createSpy('globalSetTimeout')
         .and.callFake(function(cb, t) {
@@ -1318,10 +1310,6 @@ describe('Env integration', function() {
     });
 
     it('should not use the mock clock for asynchronous timeouts', function(done) {
-      if (jasmine.getEnv().skipBrowserFlake) {
-        jasmine.getEnv().skipBrowserFlake();
-      }
-
       createMockedEnv();
       var reporter = jasmine.createSpyObj('fakeReporter', ['specDone']),
         clock = env.clock;
@@ -1360,10 +1348,6 @@ describe('Env integration', function() {
     });
 
     it('should wait a custom interval before reporting async functions that fail to complete', function(done) {
-      if (jasmine.getEnv().skipBrowserFlake) {
-        jasmine.getEnv().skipBrowserFlake();
-      }
-
       createMockedEnv();
       var reporter = jasmine.createSpyObj('fakeReport', [
         'jasmineDone',
@@ -2939,10 +2923,6 @@ describe('Env integration', function() {
   });
 
   it('provides custom equality testers to async matchers', function(done) {
-    if (jasmine.getEnv().skipBrowserFlake) {
-      jasmine.getEnv().skipBrowserFlake();
-    }
-
     var specDone = jasmine.createSpy('specDone');
 
     env.addReporter({ specDone: specDone });
diff --git a/spec/helpers/disableBrowserFlakes.js b/spec/helpers/disableBrowserFlakes.js
deleted file mode 100644
index 9206c4c8..00000000
--- a/spec/helpers/disableBrowserFlakes.js
+++ /dev/null
@@ -1,7 +0,0 @@
-(function(env) {
-  env.skipBrowserFlake = function() {
-    pending(
-      'Skipping specs that are known to be flaky in browsers in this run'
-    );
-  };
-})(jasmine.getEnv());
diff --git a/spec/support/jasmine-browser.js b/spec/support/jasmine-browser.js
index 04950c16..334efcf1 100644
--- a/spec/support/jasmine-browser.js
+++ b/spec/support/jasmine-browser.js
@@ -41,7 +41,3 @@ module.exports = {
     }
   }
 };
-
-if (process.env.SKIP_JASMINE_BROWSER_FLAKES === 'true') {
-  module.exports.helpers.push('helpers/disableBrowserFlakes.js');
-}