Integrate SauceLabs automated testing

kamilogorek · kamilogorek · commit 4ef56b55d1be · 2017-09-04T11:20:30.000+02:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -226,6 +226,25 @@ module.exports = function(grunt) {
       }
     },
 
+    'saucelabs-mocha': {
+      all: {
+        options: {
+          urls: [
+            'http://127.0.0.1:9999/test/index.html',
+            'http://127.0.0.1:9999/test/integration/index.html'
+          ],
+          sauceConfig: {
+            'video-upload-on-pass': false
+          },
+          build: process.env.TRAVIS_BUILD_NUMBER,
+          testname:
+            'Raven.js' +
+            (process.env.TRAVIS_JOB_NUMBER ? ' #' + process.env.TRAVIS_JOB_NUMBER : ''),
+          browsers: [['macOS 10.12', 'chrome', 'latest']]
+        }
+      }
+    },
+
     release: {
       options: {
         npm: false,
@@ -258,6 +277,12 @@ module.exports = function(grunt) {
     },
 
     connect: {
+      ci: {
+        options: {
+          port: 9999
+        }
+      },
+
       test: {
         options: {
           port: 8000,
@@ -330,6 +355,14 @@ module.exports = function(grunt) {
     grunt.config.set('pkg', pkg);
   });
 
+  grunt.registerTask('config:ci', 'Verify CI config', function() {
+    if (!process.env.SAUCE_USERNAME)
+      console.warn('No SAUCE_USERNAME env variable defined.');
+    if (!process.env.SAUCE_ACCESS_KEY)
+      console.warn('No SAUCE_ACCESS_KEY env variable defined.');
+    if (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY) process.exit(1);
+  });
+
   // Grunt contrib tasks
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-clean');
@@ -344,6 +377,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-gitinfo');
   grunt.loadNpmTasks('grunt-sri');
   grunt.loadNpmTasks('grunt-eslint');
+  grunt.loadNpmTasks('grunt-saucelabs');
 
   // Build tasks
   grunt.registerTask('_prep', ['clean', 'gitinfo', 'version']);
@@ -368,6 +402,13 @@ module.exports = function(grunt) {
 
   // Test task
   grunt.registerTask('test', ['eslint', 'browserify.core', 'browserify:test', 'mocha']);
+  grunt.registerTask('test-ci', [
+    'config:ci',
+    'browserify.core',
+    'browserify:test',
+    'connect:ci',
+    'saucelabs-mocha'
+  ]);
 
   // Webserver tasks
   grunt.registerTask('run:test', ['connect:test']);
diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
     "grunt-mocha": "1.0.4",
     "grunt-release": "^0.13.0",
     "grunt-s3": "0.2.0-alpha.3",
+    "grunt-saucelabs": "^9.0.0",
     "grunt-sri": "mattrobenolt/grunt-sri#pretty",
     "husky": "^0.14.3",
     "jquery": "^2.1.4",
diff --git a/test/index.html b/test/index.html
@@ -4,58 +4,67 @@
     <title>Raven.js Test Suite</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
-  </head>
-  <body>
-    <div id="mocha"></div>
+
     <!-- Mocha -->
     <script src="../node_modules/mocha/mocha.js"></script>
     <script src="../node_modules/chai/chai.js"></script>
     <script>
-        mocha.ui('bdd');
-        mocha.reporter('html');
-        var assert = chai.assert
+      mocha.ui('bdd');
+      mocha.reporter('html');
+      var assert = chai.assert
     </script>
 
     <!-- Mocking -->
     <script src="../node_modules/sinon/pkg/sinon.js"></script>
     <script>
-    window.__DEV__ = true;
-    beforeEach(function() {
+      window.__DEV__ = true;
+
+      beforeEach(function() {
         this.sinon = sinon.sandbox.create();
-    });
+      });
 
-    afterEach(function() {
+      afterEach(function() {
         this.sinon.restore();
-    });
+      });
     </script>
 
     <!-- Tests -->
     <script src="../build/raven.test.js"></script>
+  </head>
+  <body>
+    <div id="mocha"></div>
 
     <script>
-        if (!window.PHANTOMJS) {
-            (function(runner){
-              var failed = [];
-
-              runner.on('fail', function(test, err){
-                failed.push({
-                  title: test.title,
-                  fullTitle: test.fullTitle(),
-                  error: {
-                    message: err.message,
-                    stack: err.stack
-                  }
-                });
-              });
-
-              runner.on('end', function(){
-                runner.stats.failed = failed;
-                if (typeof global !== "undefined") {
-                  global.mochaResults = runner.stats;
-                }
-              });
-            })(mocha.run());
-        }
+      if (!window.PHANTOMJS) {
+        window.onload = function () {
+          var runner = mocha.run();
+          var failedTests = [];
+
+          var flattenTitles = function (test) {
+            var titles = [];
+            while (test.parent.title){
+              titles.push(test.parent.title);
+              test = test.parent;
+            }
+            return titles.reverse();
+          };
+
+          runner.on('fail', function (test, err) {
+            failedTests.push({
+              name: test.title,
+              result: false,
+              message: err.message,
+              stack: err.stack,
+              titles: flattenTitles(test)
+            });
+          });
+
+          runner.on('end', function () {
+            window.mochaResults = runner.stats;
+            window.mochaResults.reports = failedTests;
+          });
+        };
+      }
     </script>
   </body>
 </html>
diff --git a/test/integration/frame.html b/test/integration/frame.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 <head>
   <meta charset="utf-8">
diff --git a/test/integration/index.html b/test/integration/index.html
@@ -4,62 +4,53 @@
     <title>Raven.js Test Suite</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
-  </head>
-  <body>
-    <div id="mocha"></div>
+
     <!-- Mocha -->
     <script src="../../node_modules/mocha/mocha.js"></script>
     <script src="../../node_modules/chai/chai.js"></script>
     <script>
-        mocha.ui('bdd');
-        mocha.reporter('html');
-        var assert = chai.assert
-    </script>
-
-    <!-- Mocking -->
-    <script src="../../node_modules/sinon/pkg/sinon.js"></script>
-    <script src="../../build/raven.js"></script>
-    <script>
-    beforeEach(function() {
-        this.sinon = sinon.sandbox.create();
-        var xhr = sinon.useFakeXMLHttpRequest();
-        window.requests = this.requests = [];
-
-        xhr.onCreate = function (xhr) {
-          requests.push(xhr);
-        };
-    });
-
-    afterEach(function() {
-        this.sinon.restore();
-    });
+      mocha.ui('bdd');
+      mocha.reporter('html');
+      var assert = chai.assert
     </script>
 
     <!-- Tests -->
+    <script src="../../build/raven.js"></script>
     <script src="test.js"></script>
+  </head>
+  <body>
+    <div id="mocha"></div>
 
     <script>
       if (!window.PHANTOMJS) {
-        (function (runner) {
-          window.runner = runner;
-          var failed = [];
+        window.onload = function () {
+          var runner = mocha.run();
+          var failedTests = [];
+
+          var flattenTitles = function (test) {
+            var titles = [];
+            while (test.parent.title){
+              titles.push(test.parent.title);
+              test = test.parent;
+            }
+            return titles.reverse();
+          };
 
           runner.on('fail', function (test, err) {
-            failed.push({
-              title: test.title,
-              fullTitle: test.fullTitle(),
-              error: {
-                message: err.message,
-                stack: err.stack
-              }
+            failedTests.push({
+              name: test.title,
+              result: false,
+              message: err.message,
+              stack: err.stack,
+              titles: flattenTitles(test)
             });
           });
 
           runner.on('end', function () {
-            runner.stats.failed = failed;
             window.mochaResults = runner.stats;
+            window.mochaResults.reports = failedTests;
           });
-        })(mocha.run());
+        };
       }
     </script>
   </body>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!DOCTYPE html>`
	`1`	`+<!doctype html>`
`2`	`2`	`<html>`
`3`	`3`	`<head>`
`4`	`4`	`<meta charset="utf-8">`