Actually strip empty tags/extras

Author: mattrobenolt

src/raven.js

@@ -362,6 +362,11 @@ function isString(what) {
     return typeof what === 'string';
 }
 
+function isEmptyObject(what) {
+    for (var k in what) return false;
+    return true;
+}
+
 function each(obj, callback) {
     var i, j;
 
@@ -583,8 +588,8 @@ function send(data) {
     data.extra = arrayMerge(globalOptions.extra, data.extra);
 
     // If there are no tags/extra, strip the key from the payload alltogther.
-    if (!data.tags) delete data.tags;
-    if (!data.extra) delete data.extra;
+    if (isEmptyObject(data.tags)) delete data.tags;
+    if (isEmptyObject(data.extra)) delete data.extra;
 
     if (globalUser) {
         // sentry.interfaces.User

test/raven.test.js

@@ -102,6 +102,13 @@ describe('globals', function() {
         });
     });
 
+    describe('isEmptyObject', function() {
+        it('should work as advertised', function() {
+            assert.isTrue(isEmptyObject({}));
+            assert.isFalse(isEmptyObject({foo: 1}));
+        });
+    });
+
     describe('isSetup', function() {
         it('should return false with no JSON support', function() {
             globalServer = 'http://localhost/';
@@ -669,6 +676,38 @@ describe('globals', function() {
                 lol: 'ibrokeit'
             }]);
         });
+
+        it('should strip empty tags/extra', function() {
+            this.sinon.stub(window, 'isSetup').returns(true);
+            this.sinon.stub(window, 'makeRequest');
+            this.sinon.stub(window, 'getHttpData').returns({
+                url: 'http://localhost/?a=b',
+                headers: {'User-Agent': 'lolbrowser'}
+            });
+
+            globalOptions = {
+                projectId: 2,
+                logger: 'javascript',
+                site: 'THE BEST',
+                tags: {},
+                extra: {}
+            };
+
+            send({foo: 'bar', tags: {}, extra: {}});
+            assert.deepEqual(window.makeRequest.lastCall.args[0], {
+                project: 2,
+                logger: 'javascript',
+                site: 'THE BEST',
+                platform: 'javascript',
+                request: {
+                    url: 'http://localhost/?a=b',
+                    headers: {
+                        'User-Agent': 'lolbrowser'
+                    }
+                },
+                foo: 'bar'
+            });
+        });
     });
 
     describe('makeRequest', function() {