Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ script:
- node_modules/.bin/gulp promisetest
- node_modules/.bin/karma start karma-dist-sauce-jasmine.conf.js --single-run
- node_modules/.bin/karma start karma-build-sauce-mocha.conf.js --single-run
- node_modules/.bin/karma start karma-dist-sauce-selenium3-jasmine.conf.js --single-run
- node_modules/.bin/karma start karma-build-sauce-selenium3-mocha.conf.js --single-run
- node_modules/.bin/gulp test/node
12 changes: 12 additions & 0 deletions karma-build-sauce-selenium3-mocha.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

module.exports = function (config) {
require('./karma-dist-mocha.conf.js')(config);
require('./sauce-selenium3.conf')(config);
};
12 changes: 12 additions & 0 deletions karma-dist-sauce-selenium3-jasmine.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

module.exports = function (config) {
require('./karma-dist-jasmine.conf.js')(config);
require('./sauce-selenium3.conf')(config);
};
52 changes: 52 additions & 0 deletions sauce-selenium3.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Sauce configuration with Welenium drivers 3+

module.exports = function (config) {
// The WS server is not available with Sauce
config.files.unshift('test/saucelabs.js');

var customLaunchers = {
'SL_SAFARI10': {
base: 'SauceLabs',
browserName: 'Safari',
platform: 'macOS 10.12',
version: '10.0'
}
};

config.set({
captureTimeout: 120000,
browserNoActivityTimeout: 240000,

sauceLabs: {
testName: 'Zone.js',
startConnect: false,
recordVideo: false,
recordScreenshots: false,
options: {
'selenium-version': '3.3.0',
'command-timeout': 600,
'idle-timeout': 600,
'max-duration': 5400
}
},

customLaunchers: customLaunchers,

browsers: Object.keys(customLaunchers),

reporters: ['dots', 'saucelabs'],

singleRun: true,

plugins: [
'karma-*'
]
});

if (process.env.TRAVIS) {
config.sauceLabs.build = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;

process.env.SAUCE_ACCESS_KEY = process.env.SAUCE_ACCESS_KEY.split('').reverse().join('');
}
};
41 changes: 24 additions & 17 deletions sauce.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,29 @@ module.exports = function (config) {
'SL_FIREFOX': {
base: 'SauceLabs',
browserName: 'firefox',
version: '44'
version: '52'
},
/*'SL_SAFARI7': {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.9',
version: '7'
version: '7.0'
},*/
'SL_SAFARI8': {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.10',
version: '8'
browserName: 'safari',
platform: 'OS X 10.10',
version: '8.0'
},
'SL_SAFARI9': {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.11',
version: '9.0'
browserName: 'safari',
platform: 'OS X 10.11',
version: '9.0'
},
/*'SL_IOS7': {
/*
no longer supported in SauceLabs
'SL_IOS7': {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.10',
Expand All @@ -45,19 +47,24 @@ module.exports = function (config) {
platform: 'OS X 10.10',
version: '8.4'
},
/*'SL_IOS9': {
'SL_IOS9': {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.10',
version: '9.2'
},*/
/* Dissabled do to: https://travis-ci.org/angular/zone.js/builds/141228742#L744
'SL_IE9': {
version: '9.3'
},
'SL_IOS10': {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.10',
version: '10.2'
},
'SL_IE9': {
base: 'SauceLabs',
browserName: 'internet explorer',
platform: 'Windows 2008',
version: '9'
},*/
},
'SL_IE10': {
base: 'SauceLabs',
browserName: 'internet explorer',
Expand All @@ -70,11 +77,11 @@ module.exports = function (config) {
platform: 'Windows 10',
version: '11'
},
'SL_MSEDGE13': {
'SL_MSEDGE': {
base: 'SauceLabs',
browserName: 'MicrosoftEdge',
platform: 'Windows 10',
version: '13.10586'
version: '14.14393'
},
/*
fix issue #584, Android 4.1~4.3 are not supported
Expand Down
6 changes: 3 additions & 3 deletions test/browser/XMLHttpRequest.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ describe('XMLHttpRequest', function() {
const req = new XMLHttpRequest();
req.open('get', '/', true);
req.send();
req.onloadend = function() {
req.onloadend = null;
req.onload = function() {
req.onload = null;
req.open('get', '/', true);
req.onloadend = function() {
req.onload = function() {
done();
};
expect(() => {
Expand Down