Replaced karma sauce with grunt-saucelabs

videojs · May 13, 2015 · 5564f3f · 5564f3f
1 parent 30303b2
commit 5564f3f
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 68 deletions.
diff --git a/build/tasks/test-travis.js b/build/tasks/test-travis.js
@@ -15,14 +15,7 @@ module.exports = function(grunt) {
     if (!process.env.SAUCE_ACCESS_KEY) {
       grunt.task.run(['karma:firefox']);
     } else {
-      grunt.task.run([
-        'karma:chrome_sl',
-        'karma:firefox_sl',
-        'karma:safari_sl',
-        // 'karma:ipad_sl',
-        // 'karma:android_sl',
-        'karma:ie_sl'
-      ]);
+      grunt.task.run([ 'connect:dev', 'saucelabs-qunit' ]);
     }
   });
 };
diff --git a/grunt.js b/grunt.js
@@ -180,15 +180,39 @@ module.exports = function(grunt) {
       safari:       { browsers: ['Safari'] },
       ie:           { browsers: ['IE'] },
       phantomjs:    { browsers: ['PhantomJS'] },
-
-      // this only runs on PRs from the mainrepo on saucelabs
-      saucelabs:  { browsers: ['chrome_sl'] },
-      chrome_sl:  { browsers: ['chrome_sl'] },
-      firefox_sl: { browsers: ['firefox_sl'] },
-      safari_sl:  { browsers: ['safari_sl'] },
-      ipad_sl:    { browsers: ['ipad_sl'] },
-      android_sl: { browsers: ['android_sl'] },
-      ie_sl:      { browsers: ['ie_sl'] }
+    },
+    // this only runs on PRs from the mainrepo on saucelabs
+    'saucelabs-qunit': {
+      all: {
+        options: {
+          urls: [ 'http://127.0.0.1:9999/test/index.html' ],
+          browsers: [{
+            browserName: 'chrome',
+            platform: 'WIN8.1'
+          }, {
+            browserName: 'firefox',
+            platform: 'Linux'
+          }, {
+            browserName: 'safari',
+            platform: 'OS X 10.10'
+          }, {
+            browserName: 'iPad',
+            version: '8.2'
+          }, {
+            browserName: 'Android'
+          }, {
+            browserName: 'internet explorer',
+            platform: 'WIN8.1'
+          }],
+          tunneled: false,
+          build: process.env.TRAVIS_BUILD_NUMBER,
+          testname: process.env.TRAVIS_BUILD_NUMBER + process.env.TRAVIS_BRANCH,
+          throttled: 3,
+          sauceConfig: {
+            tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER
+          }
+        }
+      }
     },
     vjsdocs: {
       all: {

diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
     "grunt-github-releaser": "^0.1.17",
     "grunt-karma": "^0.8.3",
     "grunt-sass": "^0.18.1",
+    "grunt-saucelabs": "^8.6.1",
     "grunt-version": "~0.3.0",
     "grunt-videojs-languages": "0.0.4",
     "grunt-zip": "0.10.2",
@@ -70,7 +71,6 @@
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-qunit": "^0.1.2",
     "karma-safari-launcher": "^0.1.1",
-    "karma-sauce-launcher": "^0.2.8",
     "karma-sinon": "^1.0.3",
     "load-grunt-tasks": "^3.1.0",
     "qunitjs": "~1.14.0",

diff --git a/test/index.html b/test/index.html
@@ -9,7 +9,33 @@
 <body>
   <div id="qunit"></div>
   <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
-
+  <script type="text/javascript">
+    var log = [];
+    var testName;
+    QUnit.testStart(function (testDetails) {
+      QUnit.log = function (details) {
+        if (!details.result) {
+          details.name = testDetails.name;
+          log.push(details);
+        }
+      };
+    });
+    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;
+      window.global_test_results = test_results;
+    });
+  </script>
   <!-- Execute the bundled tests first -->
   <script src="../build/temp/tests.js"></script>
 

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -1,40 +1,4 @@
 module.exports = function(config) {
-  var customLaunchers = {
-    chrome_sl: {
-      base: 'SauceLabs',
-      browserName: 'chrome',
-      platform: 'Windows 8.1'
-    },
-
-    firefox_sl: {
-      base: 'SauceLabs',
-      browserName: 'firefox',
-      platform: 'Linux'
-    },
-
-    safari_sl: {
-      base: 'SauceLabs',
-      browserName: 'safari',
-      platform: 'OS X 10.10'
-    },
-
-    ipad_sl: {
-      base: 'SauceLabs',
-      browserName: 'iPad',
-      version: '8.2'
-    },
-
-    android_sl: {
-      base: 'SauceLabs',
-      browserName: 'Android'
-    },
-
-    ie_sl: {
-      base: 'SauceLabs',
-      browserName: 'internet explorer'
-    }
-  };
-
   config.set({
     basePath: '',
 
@@ -62,11 +26,10 @@ module.exports = function(config) {
       'karma-opera-launcher',
       'karma-phantomjs-launcher',
       'karma-safari-launcher',
-      'karma-sauce-launcher',
       'karma-coverage'
     ],
 
-    reporters: ['dots', 'saucelabs', 'coverage'],
+    reporters: ['dots', 'coverage'],
 
     // web server port
     port: 9876,
@@ -78,18 +41,9 @@ module.exports = function(config) {
 
     logLevel: config.LOG_INFO,
 
-    captureTimeout: 60000,
-
-    browserNoActivityTimeout: 60000,
+    captureTimeout: 300000,
 
-    sauceLabs: {
-      startConnect: false,
-      tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
-      build: process.env.TRAVIS_BUILD_NUMBER,
-      testName: process.env.TRAVIS_BUILD_NUMBER + process.env.TRAVIS_BRANCH,
-      recordScreenshots: false
-    },
-    customLaunchers: customLaunchers,
+    browserNoActivityTimeout: 300000,
 
     // The HTML reporter seems to be busted right now, so we're just using text in the meantime
     // along with the summary after the test run.