Add integration tests to Gruntfile / CI

benvinegar · benvinegar · commit a8f2eb50849d · 2015-12-17T16:32:31.000-08:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -159,18 +159,22 @@ module.exports = function(grunt) {
         },
 
         mocha: {
-            all: {
-                options: {
-                    mocha: {
-                        ignoreLeaks: true,
-                        grep:        grunt.option('grep')
-                    },
-                    log:      true,
-                    reporter: 'Dot',
-                    run:      true
+            options: {
+                mocha: {
+                    ignoreLeaks: true,
+                    grep:        grunt.option('grep')
                 },
+                log:      true,
+                reporter: 'Dot',
+                run:      true
+            },
+            unit: {
                 src: ['test/index.html'],
                 nonull: true
+            },
+            integration: {
+                src: ['test/integration/index.html'],
+                nonull: true
             }
         },
 
diff --git a/test/integration/frame.html b/test/integration/frame.html
@@ -2,12 +2,49 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>JS Bin</title>
-  <script src="../../dist/raven.js"></script>
+  <title></title>
   <script>
+    // http://paulirish.com/2011/requestanimationframe-for-smart-animating/
+    // http://my.opera.com/emoller/blog/2011/12/20/requestanimationframe-for-smart-er-animating
+
+    // requestAnimationFrame polyfill by Erik Möller. fixes from Paul Irish and Tino Zijdel
+
+    // MIT license
+
+    (function() {
+      var lastTime = 0;
+      var vendors = ['ms', 'moz', 'webkit', 'o'];
+      for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
+        window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
+        window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame']
+                || window[vendors[x]+'CancelRequestAnimationFrame'];
+      }
+
+      if (!window.requestAnimationFrame)
+        window.requestAnimationFrame = function(callback, element) {
+          var currTime = new Date().getTime();
+          var timeToCall = Math.max(0, 16 - (currTime - lastTime));
+          var id = window.setTimeout(function() { callback(currTime + timeToCall); },
+                  timeToCall);
+          lastTime = currTime + timeToCall;
+          return id;
+        };
+
+      if (!window.cancelAnimationFrame)
+        window.cancelAnimationFrame = function(id) {
+          clearTimeout(id);
+        };
+    }());
+  </script>
+  <script src="../../build/raven.js"></script>
+  <script>
+    // stub _makeRequest so we don't actually transmit any data
     Raven._makeRequest = function () {};
 
+    // get a reference to the original, unwrapped setTimeout (used for
+    // making "clean" stack traces that don't originate from mocha)
     window.origSetTimeout = setTimeout;
+
     Raven.config('https://public@example.com/1', {
       dataCallback: function (data) {
         window.ravenData = data;
diff --git a/test/integration/index.html b/test/integration/index.html
@@ -39,26 +39,28 @@
     <script src="test.js"></script>
 
     <script>
-    (function(runner){
-      window.runner = runner;
-      var failed = [];
+      if (!window.PHANTOMJS) {
+        (function (runner) {
+          window.runner = 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('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;
-        window.mochaResults = runner.stats;
-      });
-    })(mocha.run());
+          runner.on('end', function () {
+            runner.stats.failed = failed;
+            window.mochaResults = runner.stats;
+          });
+        })(mocha.run());
+      }
     </script>
   </body>
 </html>
diff --git a/test/integration/test.js b/test/integration/test.js
@@ -196,7 +196,6 @@ describe('integration', function () {
               },
               function () {
                   var ravenData = iframe.contentWindow.ravenData;
-                  console.log(ravenData);
                   // # of frames alter significantly between chrome/firefox & safari
                   assert.isAbove(ravenData.exception.values[0].stacktrace.frames.length, 2);
               }

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,6 @@ describe('integration', function () {`
`196`	`196`	`},`
`197`	`197`	`function () {`
`198`	`198`	`var ravenData = iframe.contentWindow.ravenData;`
`199`		`- console.log(ravenData);`
`200`	`199`	`// # of frames alter significantly between chrome/firefox & safari`
`201`	`200`	`assert.isAbove(ravenData.exception.values[0].stacktrace.frames.length, 2);`
`202`	`201`	`}`