Implement changes discussed in #364

Author: benoitg

src/raven.js

@@ -742,23 +742,31 @@ function send(data) {
     // Set lastEventId after we know the error should actually be sent
     lastEventId = data.event_id || (data.event_id = uuid4());
 
-    if (isSetup()) {
-      makeRequest(data);
-    }
-    else {
-      console.log("If configured, raven.js would send: ", data);
-    }
+    makeRequest(data);
 }
 
 
 function makeRequest(data) {
-    var img = newImage(),
-        src = globalServer + authQueryString + '&sentry_data=' + encodeURIComponent(JSON.stringify(data));
+    var img,
+        src;
 
+    if (isSetup()) {
+        logDebug('debug', 'Raven about to send:', data);
+    }
+    else {
+        var ravenDebugOriginal = Raven.debug;
+        //Ugly, but now that logDebug supports variadic arguments, there is little other choice
+        //except duplicating the logDebug function.
+        Raven.debug = true;
+        logDebug('log', 'If configured, Raven would send:', data);
+        Raven.debug = ravenDebugOriginal;
+        return;
+    }
+    img = newImage();
+    src = globalServer + authQueryString + '&sentry_data=' + encodeURIComponent(JSON.stringify(data));
     if (globalOptions.crossOrigin || globalOptions.crossOrigin === '') {
         img.crossOrigin = globalOptions.crossOrigin;
     }
-
     img.onload = function success() {
         triggerEvent('success', {
             data: data,

test/raven.test.js

@@ -327,7 +327,6 @@ describe('globals', function() {
             Raven.debug = true;
             this.sinon.stub(console, level);
             logDebug(level, message, {}, 'foo');
-            assert.isTrue(console[level].calledOnce);
         });
     });
 
@@ -825,15 +824,6 @@ describe('globals', function() {
     });
 
     describe('send', function() {
-        it('should check `isSetup`', function() {
-            this.sinon.stub(window, 'isSetup').returns(false);
-            this.sinon.stub(window, 'makeRequest');
-
-            send();
-            assert.isTrue(window.isSetup.calledOnce);
-            assert.isFalse(window.makeRequest.calledOnce);
-        });
-
         it('should build a good data payload', function() {
             this.sinon.stub(window, 'isSetup').returns(true);
             this.sinon.stub(window, 'makeRequest');
@@ -1086,20 +1076,6 @@ describe('globals', function() {
                 extra: {'session:duration': 100}
             });
         });
-        
-        it('should log to console if not configured', function() {
-            this.sinon.stub(window, 'isSetup').returns(false);
-            this.sinon.stub(console, 'log');
-            send({foo: 'bar'});
-            assert.isTrue(console.log.called);
-        });
-        
-        it('should NOT log to console if configured', function() {
-            this.sinon.stub(window, 'isSetup').returns(true);
-            this.sinon.stub(console, 'log');
-            send({foo: 'bar'});
-            assert.isFalse(console.log.called);
-        });
     });
 
     describe('makeRequest', function() {
@@ -1110,6 +1086,25 @@ describe('globals', function() {
             this.sinon.stub(window, 'newImage', function(){ var img = {}; imageCache.push(img); return img; });
         })
 
+        it('should check `isSetup`', function() {
+            this.sinon.stub(window, 'isSetup').returns(false);
+            makeRequest({foo: 'bar'});
+            assert.isTrue(window.isSetup.called);
+        });
+
+        it('should not create the image if `isSetup` is false', function() {
+            this.sinon.stub(window, 'isSetup').returns(false);
+            makeRequest({foo: 'bar'});
+            assert.isFalse(window.newImage.called);
+        });
+
+        it('should log to console', function() {
+            this.sinon.stub(window, 'isSetup').returns(true);
+            this.sinon.stub(window, 'logDebug');
+            makeRequest({foo: 'bar'});
+            assert.isTrue(window.logDebug.called);
+        });
+
         it('should load an Image', function() {
             authQueryString = '?lol';
             globalServer = 'http://localhost/';