Merge branch 'location'

Author: dcramer

src/raven.js

@@ -688,13 +688,18 @@ function now() {
 }
 
 function getHttpData() {
+    if (!document.location || !document.location.href) {
+        return;
+    }
+
     var http = {
-        url: document.location.href,
         headers: {
             'User-Agent': navigator.userAgent
         }
     };
 
+    http.url = document.location.href;
+
     if (document.referrer) {
         http.headers.Referer = document.referrer;
     }
@@ -705,13 +710,18 @@ function getHttpData() {
 function send(data) {
     if (!isSetup()) return;
 
-    data = objectMerge({
+    var baseData = {
         project: globalProject,
         logger: globalOptions.logger,
         platform: 'javascript',
         // sentry.interfaces.Http
-        request: getHttpData()
-    }, data);
+    };
+    var http = getHttpData();
+    if (http) {
+        baseData.http = http;
+    }
+
+    data = objectMerge(baseData, data);
 
     // Merge in the tags and extra separately since objectMerge doesn't handle a deep merge
     data.tags = objectMerge(objectMerge({}, globalOptions.tags), data.tags);

test/raven.test.js

@@ -196,7 +196,7 @@ describe('globals', function() {
         var data = getHttpData();
 
         it('should have a url', function() {
-                assert.equal(data.url, window.location.href);
+            assert.equal(data.url, window.location.href);
         });
 
         it('should have the user-agent header', function() {
@@ -211,7 +211,6 @@ describe('globals', function() {
                 assert.isUndefined(data.headers.Referer);
             }
         });
-
     });
 
     describe('isUndefined', function() {