Try a different configuration to make SauceConnect work in Travis again
This commit is contained in:
+2
-2
@@ -15,8 +15,8 @@ branches:
|
|||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
addons:
|
addons:
|
||||||
sauce_connect:
|
hosts:
|
||||||
username: openlayers
|
- travis.dev
|
||||||
jwt:
|
jwt:
|
||||||
# This is the encrypted SAUCE_ACCESS_KEY
|
# This is the encrypted SAUCE_ACCESS_KEY
|
||||||
secure: bb2Ibzu9RLe6ZlIG7JVcuH7IoLMxa/i3LTM7t8mbsPjVOGs5ycyJ7M9MbvqB/F2EzbeV4XB2c9ufI4TkaLYceY5kdWjfZVN8iasr+GFqKMv1uR4i6bpu8KmHJ+blxwfY1QOQ/cGwEx+fbeycMtpTc3Y3GyXaPlCQLhbZvesMg88=
|
secure: bb2Ibzu9RLe6ZlIG7JVcuH7IoLMxa/i3LTM7t8mbsPjVOGs5ycyJ7M9MbvqB/F2EzbeV4XB2c9ufI4TkaLYceY5kdWjfZVN8iasr+GFqKMv1uR4i6bpu8KmHJ+blxwfY1QOQ/cGwEx+fbeycMtpTc3Y3GyXaPlCQLhbZvesMg88=
|
||||||
|
|||||||
+3
-2
@@ -67,8 +67,8 @@
|
|||||||
"jquery": "3.2.1",
|
"jquery": "3.2.1",
|
||||||
"jscodeshift": "^0.3.30",
|
"jscodeshift": "^0.3.30",
|
||||||
"karma": "^1.7.0",
|
"karma": "^1.7.0",
|
||||||
"karma-coverage": "^1.1.1",
|
|
||||||
"karma-chrome-launcher": "^2.1.1",
|
"karma-chrome-launcher": "^2.1.1",
|
||||||
|
"karma-coverage": "^1.1.1",
|
||||||
"karma-firefox-launcher": "^1.0.1",
|
"karma-firefox-launcher": "^1.0.1",
|
||||||
"karma-mocha": "^1.3.0",
|
"karma-mocha": "^1.3.0",
|
||||||
"karma-sauce-launcher": "^1.1.0",
|
"karma-sauce-launcher": "^1.1.0",
|
||||||
@@ -83,7 +83,8 @@
|
|||||||
"proj4": "2.4.4",
|
"proj4": "2.4.4",
|
||||||
"serve-files": "1.0.1",
|
"serve-files": "1.0.1",
|
||||||
"sinon": "3.2.1",
|
"sinon": "3.2.1",
|
||||||
"slimerjs": "0.10.3"
|
"slimerjs": "0.10.3",
|
||||||
|
"url-polyfill": "^1.0.7"
|
||||||
},
|
},
|
||||||
"eslintConfig": {
|
"eslintConfig": {
|
||||||
"extends": "openlayers",
|
"extends": "openlayers",
|
||||||
|
|||||||
+14
-8
@@ -15,11 +15,14 @@ module.exports = function(karma) {
|
|||||||
karma.set({
|
karma.set({
|
||||||
frameworks: ['mocha'],
|
frameworks: ['mocha'],
|
||||||
client: {
|
client: {
|
||||||
runInParent: true
|
runInParent: true,
|
||||||
|
mocha: {
|
||||||
|
timeout: 2500
|
||||||
|
}
|
||||||
},
|
},
|
||||||
files: [
|
files: [
|
||||||
{
|
{
|
||||||
pattern: 'https://cdn.polyfill.io/v2/polyfill.min.js?features=URL|gated',
|
pattern: path.resolve(__dirname, require.resolve('url-polyfill/url-polyfill.js')),
|
||||||
watched: false
|
watched: false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -98,7 +101,7 @@ module.exports = function(karma) {
|
|||||||
// },
|
// },
|
||||||
SL_Safari: {
|
SL_Safari: {
|
||||||
base: 'SauceLabs',
|
base: 'SauceLabs',
|
||||||
platform: 'macos 10.12',
|
platform: 'macOS 10.12',
|
||||||
browserName: 'safari'
|
browserName: 'safari'
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -106,15 +109,18 @@ module.exports = function(karma) {
|
|||||||
sauceLabs: {
|
sauceLabs: {
|
||||||
testName: testName,
|
testName: testName,
|
||||||
recordScreenshots: false,
|
recordScreenshots: false,
|
||||||
connectOptions: {
|
startConnect: true,
|
||||||
port: 5757
|
|
||||||
},
|
|
||||||
startConnect: false,
|
|
||||||
tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
|
tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
|
||||||
username: 'openlayers',
|
username: 'openlayers',
|
||||||
accessKey: process.env.SAUCE_ACCESS_KEY
|
accessKey: process.env.SAUCE_ACCESS_KEY,
|
||||||
|
connectOptions: {
|
||||||
|
noSslBumpDomains: 'all'
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
hostname: 'travis.dev',
|
||||||
reporters: ['dots', 'saucelabs', 'coverage'],
|
reporters: ['dots', 'saucelabs', 'coverage'],
|
||||||
|
browserDisconnectTimeout: 10000,
|
||||||
|
browserDisconnectTolerance: 1,
|
||||||
captureTimeout: 240000,
|
captureTimeout: 240000,
|
||||||
browserNoActivityTimeout: 240000,
|
browserNoActivityTimeout: 240000,
|
||||||
customLaunchers: customLaunchers,
|
customLaunchers: customLaunchers,
|
||||||
|
|||||||
Reference in New Issue
Block a user