Skip to content

Commit fae0faa

Browse files
carhartlcarhartl
committed
Set up BrowserStack w/ Travis CI
1 parent 8b2a880 commit fae0faa

File tree

6 files changed

+46
-137
lines changed

6 files changed

+46
-137
lines changed

‎.travis.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
addons:
2+
browserstack:
3+
username: "klaushartl1"
4+
access_key:
5+
secure: "LpBr6ShBiV3Ai8YeHi44tRNHsqg1nj5rqCSZlHRG4dq59S2lmXGQjaOUVGBT5D1Omo0FKCRrky3hREt0hioWCo6hhEnRDBkNdHe4oD/4UmCyNr7n285sJaeJCMgzGcG/+aUDziiM+YlfbxN8Rp+TZ5AGnq83bxJkmQL26GKBdtA="
6+
17
language: node_js
8+
29
node_js:
310
- '6'
4-
# Only use grunt-ci for commits pushed to this repo. Fall back to regular test
5-
# for pull requests (as secure variables won't be exposed there).
11+
612
script:
713
- ./travis.sh
8-
env:
9-
# Encrypted SAUCE_USERNAME and SAUCE_ACCESS_KEY used by travis
10-
global:
11-
- secure: IkMOa/8r4sWyzUMxecsfqoPzZyIqVAMwPkQ6/HxXPbT8X7UnvqAdaicAMeHEKtOnOac+rx6pGB9HQvC8P/ZzkEBtsKLP4nEh9vsAInZvb3pXg+qbIgIK6/19X0kU4UkpDqVdWmBuFTamJvMDMstUTgEaM3869bB5vGp9taBgfVo=
12-
- secure: DKrQplF0CBiBh+cbQ8D7EKebCeklUWEELblIJdU4475Occ4G9b8ZFYO9HFwl1B8F/XapB7CsMyxbJCWor030FySeqn8bhJs9NoAVoYGg+MtWniv1EOHuZLWuOGfgQDv7qj5U0Af9Y655MmUpXSN2aDlCmQweWnYdpFTM9Dfsdd8=

‎Gruntfile.js‎

Lines changed: 3 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,6 @@ module.exports = function (grunt) {
115115
}
116116
}
117117
},
118-
'build-sauce': {
119-
options: {
120-
port: 9999,
121-
base: ['.', 'test']
122-
}
123-
},
124118
tests: {
125119
options: {
126120
port: 10000,
@@ -135,95 +129,8 @@ module.exports = function (grunt) {
135129
}
136130
}
137131
},
138-
'saucelabs-qunit': {
139-
all: {
140-
options: {
141-
urls: ['http://127.0.0.1:9999'],
142-
testname: 'Sauce Test for js-cookie',
143-
build: process.env.TRAVIS_JOB_ID,
144-
pollInterval: 10000,
145-
statusCheckAttempts: 90,
146-
throttled: 3,
147-
browsers: (function () {
148-
var browsers = {
149-
'iOS': [{
150-
browserName: 'iphone',
151-
platform: 'OS X 10.10',
152-
version: '8.2',
153-
deviceName: 'iPhone Simulator'
154-
}, {
155-
browserName: 'iphone',
156-
platform: 'OS X 10.10',
157-
version: '8.2',
158-
deviceName: 'iPad Simulator'
159-
}],
160-
'android': [{
161-
browserName: 'android',
162-
platform: 'Linux',
163-
version: '5.1',
164-
deviceName: 'Android Emulator'
165-
}],
166-
'mac': [{
167-
browserName: 'safari',
168-
platform: 'OS X 10.10',
169-
version: '8.0'
170-
}, {
171-
browserName: 'safari',
172-
platform: 'OS X 10.11',
173-
version: '9.0'
174-
}, {
175-
browserName: 'safari',
176-
platform: 'OS X 10.11',
177-
version: '10.0'
178-
}, {
179-
browserName: 'safari',
180-
platform: 'OS X 10.12',
181-
version: '11.0'
182-
}, {
183-
browserName: 'firefox',
184-
platform: 'OS X 10.11',
185-
version: '56.0'
186-
}, {
187-
browserName: 'chrome',
188-
platform: 'OS X 10.10',
189-
version: '61.0'
190-
}],
191-
'windows7': [{
192-
browserName: 'internet explorer',
193-
platform: 'Windows 7',
194-
version: '11.0'
195-
}, {
196-
browserName: 'internet explorer',
197-
platform: 'Windows 7',
198-
version: '10.0'
199-
}, {
200-
browserName: 'internet explorer',
201-
platform: 'Windows 7',
202-
version: '9.0'
203-
}, {
204-
browserName: 'internet explorer',
205-
platform: 'Windows 7',
206-
version: '8.0'
207-
}],
208-
'linux': [{
209-
browserName: 'firefox',
210-
platform: 'Linux',
211-
version: '45.0'
212-
}, {
213-
browserName: 'chrome',
214-
platform: 'Linux',
215-
version: '48.0'
216-
}]
217-
};
218-
219-
var matrix = [];
220-
for (var os in browsers) {
221-
matrix = matrix.concat(browsers[os]);
222-
}
223-
return matrix;
224-
}())
225-
}
226-
}
132+
exec: {
133+
'browserstack-runner': 'node_modules/.bin/browserstack-runner'
227134
}
228135
});
229136

@@ -234,11 +141,10 @@ module.exports = function (grunt) {
234141
}
235142
}
236143

237-
grunt.registerTask('saucelabs', ['connect:build-sauce', 'saucelabs-qunit']);
238144
grunt.registerTask('test', ['uglify', 'jshint', 'jscs', 'connect:build-qunit', 'qunit', 'nodeunit']);
239145

240146
grunt.registerTask('dev', ['test', 'compare_size']);
241-
grunt.registerTask('ci', ['test', 'saucelabs']);
147+
grunt.registerTask('ci', ['test', 'exec:browserstack-runner']);
242148

243149
grunt.registerTask('default', 'dev');
244150
};

‎browserstack.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"test_framework" : "qunit",
3+
"test_path": "test/index.html",
4+
"browsers": [
5+
"chrome_previous",
6+
"chrome_latest",
7+
"firefox_previous",
8+
"firefox_latest",
9+
"ie_6",
10+
"ie_7",
11+
"ie_8",
12+
"ie_9",
13+
"ie_10",
14+
"ie_11",
15+
"opera_latest",
16+
{
17+
"browser": "safari",
18+
"browser_version": "latest",
19+
"os": "OS X",
20+
"os_version": "High Sierra"
21+
},
22+
{
23+
"browser": "safari",
24+
"browser_version": "latest",
25+
"os": "OS X",
26+
"os_version": "Sierra"
27+
}
28+
]
29+
}

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"author": "Klaus Hartl",
3333
"license": "MIT",
3434
"devDependencies": {
35+
"browserstack-runner": "0.7.0",
3536
"grunt": "1.0.2",
3637
"grunt-compare-size": "0.4.2",
3738
"grunt-contrib-connect": "1.0.2",
@@ -40,8 +41,8 @@
4041
"grunt-contrib-qunit": "2.0.0",
4142
"grunt-contrib-uglify": "2.3.0",
4243
"grunt-contrib-watch": "1.0.0",
44+
"grunt-exec": "3.0.0",
4345
"grunt-jscs": "3.0.1",
44-
"grunt-saucelabs": "9.0.0",
4546
"gzip-js": "0.3.2",
4647
"qunitjs": "1.23.1",
4748
"requirejs": "2.3.5"

‎test/utils.js‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,6 @@
1-
// https://github.com/axemclion/grunt-saucelabs#test-result-details-with-qunit
21
(function () {
32
'use strict';
43

5-
var log = [];
6-
7-
QUnit.done(function (test_results) {
8-
var tests = [];
9-
for (var i = 0, len = log.length; i < len; i++) {
10-
var details = log[i];
11-
tests.push({
12-
name: details.name,
13-
result: details.result,
14-
expected: details.expected,
15-
actual: details.actual,
16-
source: details.source
17-
});
18-
}
19-
test_results.tests = tests;
20-
// Required for exposing test results to the Sauce Labs API.
21-
// Can be removed when the following issue is fixed:
22-
// https://github.com/axemclion/grunt-saucelabs/issues/84
23-
window.global_test_results = test_results;
24-
});
25-
26-
QUnit.testStart(function (testDetails) {
27-
QUnit.log(function (details) {
28-
if (!details.result) {
29-
details.name = testDetails.name;
30-
log.push(details);
31-
}
32-
});
33-
});
34-
354
window.lifecycle = {
365
afterEach: function () {
376
// Remove the cookies created using js-cookie default attributes

‎travis.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/bash
2-
if [ -z "$SAUCE_ACCESS_KEY" ]; then
2+
3+
# Only use `grunt ci` for commits pushed to this repo. Fall back to regular test
4+
# for pull requests (as secure variables won't be exposed there).
5+
if [ -z "$BROWSERSTACK_LOCAL_IDENTIFIER" ]; then
36
npm test
47
else
58
grunt ci --verbose

0 commit comments

Comments
 (0)