Skip to content

Commit ccccfb8

Browse files
authored
browser-tests: remove saucelabs support (#8577)
These tests have been disabled since November 2020 (04d2a45).
1 parent 9a41ca5 commit ccccfb8

File tree

8 files changed

+11
-76
lines changed

8 files changed

+11
-76
lines changed

bin/test-browser.js

Lines changed: 10 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
var wd = require('wd');
55
wd.configureHttp({timeout: 180000}); // 3 minutes
66

7-
var sauceConnectLauncher = require('sauce-connect-launcher');
87
var selenium = require('selenium-standalone');
98
var querystring = require("querystring");
109

@@ -14,9 +13,6 @@ var devserver = require('./dev-server.js');
1413

1514
var testTimeout = 30 * 60 * 1000;
1615

17-
var username = process.env.SAUCE_USERNAME;
18-
var accessKey = process.env.SAUCE_ACCESS_KEY;
19-
2016
var SELENIUM_VERSION = process.env.SELENIUM_VERSION || '3.141.0';
2117
var CHROME_BIN = process.env.CHROME_BIN;
2218
var FIREFOX_BIN = process.env.FIREFOX_BIN;
@@ -25,7 +21,7 @@ var FIREFOX_BIN = process.env.FIREFOX_BIN;
2521
var bail = process.env.BAIL !== '0';
2622

2723
// process.env.CLIENT is a colon separated list of
28-
// (saucelabs|selenium):browserName:browserVerion:platform
24+
// selenium:browserName:browserVerion:platform
2925
var tmp = (process.env.CLIENT || 'selenium:firefox').split(':');
3026
var client = {
3127
runner: tmp[0] || 'selenium',
@@ -50,13 +46,9 @@ if (process.env.PERF) {
5046

5147
var qs = { remote: 1 };
5248

53-
var sauceClient;
54-
var sauceConnectProcess;
49+
var seleniumClient;
5550
var tunnelId = process.env.TRAVIS_JOB_NUMBER || 'tunnel-' + Date.now();
5651

57-
if (client.runner === 'saucelabs') {
58-
qs.saucelabs = true;
59-
}
6052
if (process.env.INVERT) {
6153
qs.invert = process.env.INVERT;
6254
}
@@ -112,41 +104,15 @@ function startSelenium(callback) {
112104
process.exit(1);
113105
}
114106
selenium.start(opts, function () {
115-
sauceClient = wd.promiseChainRemote();
107+
seleniumClient = wd.promiseChainRemote();
116108
callback();
117109
});
118110
});
119111
}
120112

121-
function startSauceConnect(callback) {
122-
123-
var options = {
124-
username: username,
125-
accessKey: accessKey,
126-
tunnelIdentifier: tunnelId
127-
};
128-
129-
sauceConnectLauncher(options, function (err, sauceProcess) {
130-
if (err) {
131-
console.error('Failed to connect to saucelabs');
132-
console.error(err);
133-
return process.exit(1);
134-
}
135-
sauceConnectProcess = sauceProcess;
136-
sauceClient = wd.promiseChainRemote("localhost", 4445, username, accessKey);
137-
callback();
138-
});
139-
}
140-
141113
function closeClient(callback) {
142-
sauceClient.quit().then(function () {
143-
if (sauceConnectProcess) {
144-
sauceConnectProcess.close(function () {
145-
callback();
146-
});
147-
} else {
148-
callback();
149-
}
114+
seleniumClient.quit().then(function () {
115+
callback();
150116
});
151117
}
152118

@@ -244,29 +210,29 @@ function startTest() {
244210
new MochaSpecReporter(runner);
245211
new BenchmarkReporter(runner);
246212

247-
sauceClient.init(opts, function (err) {
213+
seleniumClient.init(opts, function (err) {
248214
if (err) {
249215
testError(err);
250216
return;
251217
}
252218
console.log('Initialized');
253219

254-
sauceClient.get(testUrl, function (err) {
220+
seleniumClient.get(testUrl, function (err) {
255221
if (err) {
256222
testError(err);
257223
return;
258224
}
259225
console.log('Successfully started');
260226

261-
sauceClient.eval('navigator.userAgent', function (err, userAgent) {
227+
seleniumClient.eval('navigator.userAgent', function (err, userAgent) {
262228
if (err) {
263229
testError(err);
264230
} else {
265231
console.log('Testing on:', userAgent);
266232

267233
/* jshint evil: true */
268234
var interval = setInterval(function () {
269-
sauceClient.eval('window.testEvents()', function (err, events) {
235+
seleniumClient.eval('window.testEvents()', function (err, events) {
270236
if (err) {
271237
clearInterval(interval);
272238
testError(err);
@@ -301,9 +267,5 @@ function startTest() {
301267
}
302268

303269
devserver.start(function () {
304-
if (client.runner === 'saucelabs') {
305-
startSauceConnect(startTest);
306-
} else {
307-
startSelenium(startTest);
308-
}
270+
startSelenium(startTest);
309271
});

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
"rollup-plugin-inject": "3.0.1",
104104
"rollup-plugin-node-resolve": "4.2.4",
105105
"rollup-plugin-replace": "1.2.1",
106-
"sauce-connect-launcher": "1.2.7",
107106
"seedrandom": "3.0.5",
108107
"selenium-standalone": "6.16.0",
109108
"stream-to-promise": "1.1.1",

tests/integration/test.issue3179.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ var adapters = [
77
['local', 'local']
88
];
99

10-
if ('saucelabs' in testUtils.params()) {
11-
adapters = [['local', 'http'], ['http', 'local']];
12-
}
13-
1410
adapters.forEach(function (adapters) {
1511
describe('test.issue3179.js-' + adapters[0] + '-' + adapters[1], function () {
1612

tests/integration/test.replication.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ var adapters = [
77
['local', 'local']
88
];
99

10-
if ('saucelabs' in testUtils.params()) {
11-
adapters = [['local', 'http'], ['http', 'local']];
12-
}
13-
1410
adapters.forEach(function (adapters) {
1511
describe('suite2 test.replication.js-' + adapters[0] + '-' + adapters[1], function () {
1612

@@ -2148,7 +2144,7 @@ adapters.forEach(function (adapters) {
21482144
});
21492145

21502146
it('Replicate large number of docs', function (done) {
2151-
if ('saucelabs' in testUtils.params() || testUtils.isIE()) {
2147+
if (testUtils.isIE()) {
21522148
return done();
21532149
}
21542150
var db = new PouchDB(dbs.name);

tests/integration/test.replication_events.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ var adapters = [
77
['local', 'local']
88
];
99

10-
if ('saucelabs' in testUtils.params()) {
11-
adapters = [['local', 'http'], ['http', 'local']];
12-
}
13-
14-
1510
adapters.forEach(function (adapters) {
1611
var title = 'test.replication_events.js-' + adapters[0] + '-' + adapters[1];
1712
describe('suite2 ' + title, function () {

tests/integration/test.retry.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ var adapters = [
77
['local', 'local']
88
];
99

10-
if ('saucelabs' in testUtils.params()) {
11-
adapters = [['local', 'http'], ['http', 'local']];
12-
}
13-
1410
adapters.forEach(function (adapters) {
1511
var suiteName = 'test.retry.js-' + adapters[0] + '-' + adapters[1];
1612
describe(suiteName, function () {

tests/integration/test.sync.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ var adapters = [
77
['local', 'local']
88
];
99

10-
if ('saucelabs' in testUtils.params()) {
11-
adapters = [['local', 'http'], ['http', 'local']];
12-
}
13-
1410
adapters.forEach(function (adapters) {
1511
describe('test.sync.js-' + adapters[0] + '-' + adapters[1], function () {
1612

tests/integration/test.sync_events.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ var adapters = [
77
['local', 'local']
88
];
99

10-
if ('saucelabs' in testUtils.params()) {
11-
adapters = [['local', 'http'], ['http', 'local']];
12-
}
13-
14-
1510
adapters.forEach(function (adapters) {
1611
var title = 'test.sync_events.js-' + adapters[0] + '-' + adapters[1];
1712
describe('suite2 ' + title, function () {

0 commit comments

Comments
 (0)