Set up initial, minimal BrowserStack configuration

carhartl · carhartl · commit b52f56443166 · 2018-04-13T18:36:45.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,13 @@
+addons:
+  browserstack:
+    username: "klaushartl1"
+    access_key:
+      secure: "LpBr6ShBiV3Ai8YeHi44tRNHsqg1nj5rqCSZlHRG4dq59S2lmXGQjaOUVGBT5D1Omo0FKCRrky3hREt0hioWCo6hhEnRDBkNdHe4oD/4UmCyNr7n285sJaeJCMgzGcG/+aUDziiM+YlfbxN8Rp+TZ5AGnq83bxJkmQL26GKBdtA="
+
 language: node_js
+
 node_js:
   - '6'
-# Only use grunt-ci for commits pushed to this repo. Fall back to regular test
-# for pull requests (as secure variables won't be exposed there).
+
 script:
   - ./travis.sh
-env:
-  # Encrypted SAUCE_USERNAME and SAUCE_ACCESS_KEY used by travis
-  global:
-    - secure: IkMOa/8r4sWyzUMxecsfqoPzZyIqVAMwPkQ6/HxXPbT8X7UnvqAdaicAMeHEKtOnOac+rx6pGB9HQvC8P/ZzkEBtsKLP4nEh9vsAInZvb3pXg+qbIgIK6/19X0kU4UkpDqVdWmBuFTamJvMDMstUTgEaM3869bB5vGp9taBgfVo=
-    - secure: DKrQplF0CBiBh+cbQ8D7EKebCeklUWEELblIJdU4475Occ4G9b8ZFYO9HFwl1B8F/XapB7CsMyxbJCWor030FySeqn8bhJs9NoAVoYGg+MtWniv1EOHuZLWuOGfgQDv7qj5U0Af9Y655MmUpXSN2aDlCmQweWnYdpFTM9Dfsdd8=
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -115,12 +115,6 @@ module.exports = function (grunt) {
 					}
 				}
 			},
-			'build-sauce': {
-				options: {
-					port: 9999,
-					base: ['.', 'test']
-				}
-			},
 			tests: {
 				options: {
 					port: 10000,
@@ -135,73 +129,8 @@ module.exports = function (grunt) {
 				}
 			}
 		},
-		'saucelabs-qunit': {
-			all: {
-				options: {
-					urls: ['http://127.0.0.1:9999'],
-					testname: 'Sauce Test for js-cookie',
-					build: process.env.TRAVIS_JOB_ID,
-					statusCheckAttempts: -1,
-					throttled: 3,
-					browsers: [
-						{
-							browserName: 'safari',
-							platform: 'OS X 10.11',
-							version: '10.0'
-						},
-						{
-							browserName: 'safari',
-							platform: 'OS X 10.12',
-							version: '10.1'
-						},
-						{
-							browserName: 'safari',
-							platform: 'OS X 10.13',
-							version: '11.0'
-						},
-						{
-							browserName: 'firefox',
-							platform: 'OS X 10.11',
-							version: '56.0'
-						},
-						{
-							browserName: 'chrome',
-							platform: 'OS X 10.10',
-							version: '61.0'
-						},
-						{
-							browserName: 'internet explorer',
-							platform: 'Windows 7',
-							version: '11.0'
-						},
-						{
-							browserName: 'internet explorer',
-							platform: 'Windows 7',
-							version: '10.0'
-						},
-						{
-							browserName: 'internet explorer',
-							platform: 'Windows 7',
-							version: '9.0'
-						},
-						{
-							browserName: 'internet explorer',
-							platform: 'Windows 7',
-							version: '8.0'
-						},
-						{
-							browserName: 'firefox',
-							platform: 'Linux',
-							version: '45.0'
-						},
-						{
-							browserName: 'chrome',
-							platform: 'Linux',
-							version: '48.0'
-						}
-					]
-				}
-			}
+		exec: {
+			'browserstack-runner': 'node_modules/.bin/browserstack-runner'
 		}
 	});
 
@@ -212,11 +141,10 @@ module.exports = function (grunt) {
 		}
 	}
 
-	grunt.registerTask('saucelabs', ['connect:build-sauce', 'saucelabs-qunit']);
 	grunt.registerTask('test', ['uglify', 'jshint', 'jscs', 'connect:build-qunit', 'qunit', 'nodeunit']);
 
 	grunt.registerTask('dev', ['test', 'compare_size']);
-	grunt.registerTask('ci', ['test', 'saucelabs']);
+	grunt.registerTask('ci', ['test', 'exec:browserstack-runner']);
 
 	grunt.registerTask('default', 'dev');
 };
diff --git a/browserstack.json b/browserstack.json
@@ -0,0 +1,10 @@
+{
+    "test_framework": "qunit",
+    "test_path": [
+      "test/index.html"
+    ],
+    "exit_with_fail": true,
+    "browsers": [
+      "chrome_latest"
+    ]
+}
diff --git a/package.json b/package.json
@@ -32,6 +32,7 @@
   "author": "Klaus Hartl",
   "license": "MIT",
   "devDependencies": {
+    "browserstack-runner": "0.7.0",
     "grunt": "1.0.2",
     "grunt-compare-size": "0.4.2",
     "grunt-contrib-connect": "1.0.2",
@@ -40,8 +41,8 @@
     "grunt-contrib-qunit": "2.0.0",
     "grunt-contrib-uglify": "2.3.0",
     "grunt-contrib-watch": "1.0.0",
+    "grunt-exec": "3.0.0",
     "grunt-jscs": "3.0.1",
-    "grunt-saucelabs": "9.0.0",
     "gzip-js": "0.3.2",
     "qunitjs": "1.23.1",
     "requirejs": "2.3.5"
diff --git a/test/utils.js b/test/utils.js
@@ -1,37 +1,6 @@
-// https://github.com/axemclion/grunt-saucelabs#test-result-details-with-qunit
 (function () {
 	'use strict';
 
-	var log = [];
-
-	QUnit.done(function (test_results) {
-		var tests = [];
-		for (var i = 0, len = log.length; i < len; i++) {
-			var details = log[i];
-			tests.push({
-				name: details.name,
-				result: details.result,
-				expected: details.expected,
-				actual: details.actual,
-				source: details.source
-			});
-		}
-		test_results.tests = tests;
-		// Required for exposing test results to the Sauce Labs API.
-		// Can be removed when the following issue is fixed:
-		// https://github.com/axemclion/grunt-saucelabs/issues/84
-		window.global_test_results = test_results;
-	});
-
-	QUnit.testStart(function (testDetails) {
-		QUnit.log(function (details) {
-			if (!details.result) {
-				details.name = testDetails.name;
-				log.push(details);
-			}
-		});
-	});
-
 	window.lifecycle = {
 		afterEach: function () {
 			// Remove the cookies created using js-cookie default attributes
diff --git a/travis.sh b/travis.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
-if [ -z "$SAUCE_ACCESS_KEY" ]; then
+
+# Only use `grunt ci` for commits pushed to this repo. Fall back to regular test
+# for pull requests (as secure variables won't be exposed there).
+if [ -z "$BROWSERSTACK_LOCAL_IDENTIFIER" ]; then
   npm test
 else
   grunt ci --verbose
