Skip to content

Commit 0a79401

Browse files
fixing CI failures
1 parent 381ef1a commit 0a79401

2 files changed

Lines changed: 18 additions & 25 deletions

File tree

karma.conf.js

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -114,46 +114,47 @@ function configureSauceLabs (config) {
114114
var testName = project.name + ' v' + project.version;
115115
var build = testName + ' Build #' + process.env.TRAVIS_JOB_NUMBER + ' @ ' + new Date();
116116

117-
var sauceLaunchers = {
118-
SauceLabs_Chrome_Latest: {
117+
config.sauceLabs = {
118+
build: build,
119+
testName: testName,
120+
tags: [project.name],
121+
};
122+
123+
config.customLaunchers = {
124+
SauceLabs_IE_11: {
119125
base: 'SauceLabs',
120126
platform: 'Windows 10',
121-
browserName: 'chrome'
127+
browserName: 'internet explorer'
122128
},
123-
SauceLabs_Firefox_Latest: {
129+
SauceLabs_IE_Edge: {
124130
base: 'SauceLabs',
125131
platform: 'Windows 10',
126-
browserName: 'firefox'
132+
browserName: 'microsoftedge'
127133
},
128134
SauceLabs_Safari_Latest: {
129135
base: 'SauceLabs',
130-
platform: 'macOS 10.12',
136+
platform: 'macOS 10.13',
131137
browserName: 'safari'
132138
},
133-
SauceLabs_IE_11: {
139+
SauceLabs_Chrome_Latest: {
134140
base: 'SauceLabs',
135141
platform: 'Windows 10',
136-
browserName: 'internet explorer'
142+
browserName: 'chrome'
137143
},
138-
SauceLabs_IE_Edge: {
144+
SauceLabs_Firefox_Latest: {
139145
base: 'SauceLabs',
140146
platform: 'Windows 10',
141-
browserName: 'microsoftedge'
147+
browserName: 'firefox'
142148
},
143149
};
144150

145151
config.reporters.push('saucelabs');
146-
config.browsers = config.browsers.concat(Object.keys(sauceLaunchers));
147-
config.customLaunchers = Object.assign(config.customLaunchers || {}, sauceLaunchers);
152+
config.browsers = Object.keys(config.customLaunchers);
153+
config.concurrency = 1;
148154
config.captureTimeout = 60000;
149155
config.browserDisconnectTimeout = 15000;
150156
config.browserNoActivityTimeout = 15000;
151157
// config.logLevel = 'debug';
152-
config.sauceLabs = {
153-
build: build,
154-
testName: testName,
155-
tags: [project.name],
156-
};
157158

158159
// The following tests tend to fail on SauceLabs,
159160
// probably due to zero-byte files and special characters in the paths.

test/fixtures/mocha.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88
mocha.asyncOnly();
99
mocha.checkLeaks();
1010
mocha.globals(['$0', '$1', '$2', '$3', '$4', '$5']);
11-
12-
// Output each test's name, for debugging purposes
13-
beforeEach(function () {
14-
console.log('START ' + this.currentTest.parent.title + ' - ' + this.currentTest.title);
15-
});
16-
afterEach(function () {
17-
console.log('DONE ' + this.currentTest.parent.title + ' - ' + this.currentTest.title);
18-
});
1911
}
2012

2113
beforeEach(function () {

0 commit comments

Comments
 (0)