Always run formerly flaky specs
This commit is contained in:
@@ -60,8 +60,6 @@ jobs:
|
|||||||
|
|
||||||
test_browsers: &test_browsers
|
test_browsers: &test_browsers
|
||||||
executor: node14
|
executor: node14
|
||||||
environment:
|
|
||||||
SKIP_JASMINE_BROWSER_FLAKES: "true"
|
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
at: .
|
at: .
|
||||||
@@ -90,11 +88,6 @@ jobs:
|
|||||||
scripts/stop-sauce-connect $(cat sauce-pidfile)
|
scripts/stop-sauce-connect $(cat sauce-pidfile)
|
||||||
exit $exitcode
|
exit $exitcode
|
||||||
|
|
||||||
test_browser_flakes:
|
|
||||||
<<: *test_browsers
|
|
||||||
environment:
|
|
||||||
SKIP_JASMINE_BROWSER_FLAKES: "false"
|
|
||||||
|
|
||||||
workflows:
|
workflows:
|
||||||
version: 2
|
version: 2
|
||||||
|
|
||||||
@@ -138,15 +131,3 @@ workflows:
|
|||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
ignore: /pull\/.*/ # Don't run on pull requests.
|
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.
|
|
||||||
|
|||||||
@@ -455,10 +455,6 @@ describe('Env integration', function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('copes with async failures after done has been called', function(done) {
|
it('copes with async failures after done has been called', function(done) {
|
||||||
if (jasmine.getEnv().skipBrowserFlake) {
|
|
||||||
jasmine.getEnv().skipBrowserFlake();
|
|
||||||
}
|
|
||||||
|
|
||||||
var global = {
|
var global = {
|
||||||
setTimeout: function(fn, delay) {
|
setTimeout: function(fn, delay) {
|
||||||
return setTimeout(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) {
|
it('Mock clock can be installed and used in tests', function(done) {
|
||||||
if (jasmine.getEnv().skipBrowserFlake) {
|
|
||||||
jasmine.getEnv().skipBrowserFlake();
|
|
||||||
}
|
|
||||||
|
|
||||||
var globalSetTimeout = jasmine
|
var globalSetTimeout = jasmine
|
||||||
.createSpy('globalSetTimeout')
|
.createSpy('globalSetTimeout')
|
||||||
.and.callFake(function(cb, t) {
|
.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) {
|
it('should not use the mock clock for asynchronous timeouts', function(done) {
|
||||||
if (jasmine.getEnv().skipBrowserFlake) {
|
|
||||||
jasmine.getEnv().skipBrowserFlake();
|
|
||||||
}
|
|
||||||
|
|
||||||
createMockedEnv();
|
createMockedEnv();
|
||||||
var reporter = jasmine.createSpyObj('fakeReporter', ['specDone']),
|
var reporter = jasmine.createSpyObj('fakeReporter', ['specDone']),
|
||||||
clock = env.clock;
|
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) {
|
it('should wait a custom interval before reporting async functions that fail to complete', function(done) {
|
||||||
if (jasmine.getEnv().skipBrowserFlake) {
|
|
||||||
jasmine.getEnv().skipBrowserFlake();
|
|
||||||
}
|
|
||||||
|
|
||||||
createMockedEnv();
|
createMockedEnv();
|
||||||
var reporter = jasmine.createSpyObj('fakeReport', [
|
var reporter = jasmine.createSpyObj('fakeReport', [
|
||||||
'jasmineDone',
|
'jasmineDone',
|
||||||
@@ -2939,10 +2923,6 @@ describe('Env integration', function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('provides custom equality testers to async matchers', function(done) {
|
it('provides custom equality testers to async matchers', function(done) {
|
||||||
if (jasmine.getEnv().skipBrowserFlake) {
|
|
||||||
jasmine.getEnv().skipBrowserFlake();
|
|
||||||
}
|
|
||||||
|
|
||||||
var specDone = jasmine.createSpy('specDone');
|
var specDone = jasmine.createSpy('specDone');
|
||||||
|
|
||||||
env.addReporter({ specDone: specDone });
|
env.addReporter({ specDone: specDone });
|
||||||
|
|||||||
@@ -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());
|
|
||||||
@@ -41,7 +41,3 @@ module.exports = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (process.env.SKIP_JASMINE_BROWSER_FLAKES === 'true') {
|
|
||||||
module.exports.helpers.push('helpers/disableBrowserFlakes.js');
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user