Wrap xhr prototype methods on open, not send

Author: benvinegar

src/raven.js

@@ -606,10 +606,10 @@ Raven.prototype = {
             }
         });
 
-        var origSend;
+        var origOpen;
         if ('XMLHttpRequest' in window) {
-            origSend = XMLHttpRequest.prototype.send;
-            XMLHttpRequest.prototype.send = function (data) { // preserve arity
+            origOpen = XMLHttpRequest.prototype.open;
+            XMLHttpRequest.prototype.open = function (data) { // preserve arity
                 var xhr = this;
                 'onreadystatechange onload onerror onprogress'.replace(/\w+/g, function (prop) {
                     if (prop in xhr && Object.prototype.toString.call(xhr[prop]) === '[object Function]') {
@@ -618,7 +618,7 @@ Raven.prototype = {
                         });
                     }
                 });
-                origSend.apply(this, arguments);
+                origOpen.apply(this, arguments);
             };
         }
 

test/integration/example.json

@@ -0,0 +1,3 @@
+{
+  "foo": "bar"
+}

test/integration/frame.html

@@ -7,6 +7,7 @@
   <script>
     Raven._makeRequest = function () {};
 
+    window.origSetTimeout = setTimeout;
     Raven.config('https://[email protected]/1', {
       dataCallback: function (data) {
         window.ravenData = data;

test/integration/test.js

@@ -9,7 +9,7 @@ function iframeExecute(iframe, done, execute, assertCallback) {
         }
     }
     // use setTimeout so stack trace doesn't go all the way back to mocha test runner
-    iframe.contentWindow.eval('setTimeout(' + execute.toString() + ');');
+    iframe.contentWindow.eval('origSetTimeout(' + execute.toString() + ');');
 }
 
 function createIframe(done) {
@@ -136,7 +136,7 @@ describe('integration', function () {
                 },
                 function () {
                     var ravenData = iframe.contentWindow.ravenData;
-                    assert.equal(ravenData.exception.values[0].stacktrace.frames.length, eventHandlerStackDepth + 2);
+                    assert.equal(ravenData.exception.values[0].stacktrace.frames.length, eventHandlerStackDepth + 1);
                 }
             );
         });
@@ -223,5 +223,27 @@ describe('integration', function () {
                 }
             );
         });
+
+        it('should capture exceptions from XMLHttpRequest event handlers (e.g. onreadystatechange)', function (done) {
+            var iframe = this.iframe;
+
+            iframeExecute(iframe, done,
+              function () {
+                  setTimeout(done);
+                  var xhr = new XMLHttpRequest();
+                  xhr.onreadystatechange = function () {
+                      foo();
+                  }
+                  xhr.open('GET', 'example.json');
+                  xhr.send();
+              },
+              function () {
+                  var ravenData = iframe.contentWindow.ravenData;
+                  console.log(ravenData);
+                  // # of frames alter significantly between chrome/firefox & safari
+                  assert.isTrue(ravenData.exception.values[0].stacktrace.frames.length >= 4);
+              }
+            );
+        });
     });
 });