Can pass dsn to showReportDialog, add tests

Author: benvinegar

src/raven.js

@@ -123,13 +123,8 @@ Raven.prototype = {
         this._globalKey = uri.user;
         this._globalProject = uri.path.substr(lastSlash + 1);
 
-        // assemble the endpoint from the uri pieces
-        this._globalServer = '//' + uri.host +
-                      (uri.port ? ':' + uri.port : '');
+        this._globalServer = this._getGlobalServer(uri);
 
-        if (uri.protocol) {
-            this._globalServer = uri.protocol + ':' + this._globalServer;
-        }
         this._globalEndpoint = this._globalServer +
             '/' + path + 'api/' + this._globalProject + '/store/';
 
@@ -508,26 +503,32 @@ Raven.prototype = {
         options = options || {};
 
         var lastEventId = options.eventId || this.lastEventId();
-        if (!lastEventId)
-            return;
+        if (!lastEventId) {
+            throw new RavenConfigError('Missing eventId');
+        }
+
+        var dsn = options.dsn || this._dsn;
+        if (!dsn) {
+            throw new RavenConfigError('Missing DSN');
+        }
 
         var encode = encodeURIComponent;
         var qs = '';
         qs += '?eventId=' + encode(lastEventId);
-        qs += '&dsn=' + encode(this._dsn || '');
+        qs += '&dsn=' + encode(dsn);
 
-        var user = this._globalContext.user;
+        var user = options.user || this._globalContext.user;
         if (user) {
-            if (user.name)
-                qs += '&name=' + encode(user.name);
-            if (user.email)
-                qs += '&email=' + encode(user.email);
+            if (user.name)  qs += '&name=' + encode(user.name);
+            if (user.email) qs += '&email=' + encode(user.email);
         }
 
+        var globalServer = this._getGlobalServer(this._parseDSN(dsn));
+
         var script = document.createElement('script');
         script.async = true;
-        script.src = this._globalServer + '/api/embed/error-page/' + qs;
-        document.getElementsByTagName('body')[0].appendChild(script);
+        script.src = globalServer + '/api/embed/error-page/' + qs;
+        (document.head || document.body).appendChild(script);
     },
 
     /**** Private functions ****/
@@ -715,6 +716,17 @@ Raven.prototype = {
         return dsn;
     },
 
+    _getGlobalServer: function(uri) {
+        // assemble the endpoint from the uri pieces
+        var globalServer = '//' + uri.host +
+            (uri.port ? ':' + uri.port : '');
+
+        if (uri.protocol) {
+            globalServer = uri.protocol + ':' + globalServer;
+        }
+        return globalServer;
+    },
+
     _handleOnErrorStackInfo: function() {
         // if we are intentionally ignoring errors via onerror, bail out
         if (!this._ignoreOnError) {

test/raven.test.js

@@ -5,6 +5,7 @@
 var proxyquire = require('proxyquireify')(require);
 
 var TraceKit = require('../vendor/TraceKit/tracekit');
+
 var _Raven = proxyquire('../src/raven', {
     './utils': {
         // patched to return a predictable result
@@ -2028,4 +2029,80 @@ describe('Raven (public API)', function() {
             assert.isFalse(Raven.isSetup());
         });
     });
+
+    describe('.showReportDialog', function () {
+        it('should throw a RavenConfigError if no eventId', function () {
+            assert.throws(function () {
+                Raven.showReportDialog({
+                    dsn: SENTRY_DSN // dsn specified via options
+                });
+            }, 'Missing eventId');
+
+            Raven.config(SENTRY_DSN);
+            assert.throws(function () {
+                Raven.showReportDialog(); // dsn specified via Raven.config
+            }, 'Missing eventId');
+        });
+
+        it('should throw a RavenConfigError if no dsn', function () {
+            assert.throws(function () {
+                Raven.showReportDialog({
+                    eventId: 'abc123'
+                });
+            }, 'Missing DSN');
+        });
+
+        describe('script tag insertion', function () {
+            beforeEach(function () {
+                this.appendChildStub = this.sinon.stub(document.head, 'appendChild');
+            });
+
+            it('should specify embed API endpoint and basic query string (DSN, eventId)', function () {
+                Raven.showReportDialog({
+                    eventId: 'abc123',
+                    dsn: SENTRY_DSN
+                });
+
+                var script = this.appendChildStub.getCall(0).args[0];
+                assert.equal(script.src, 'http://example.com/api/embed/error-page/?eventId=abc123&dsn=http%3A%2F%2Fabc%40example.com%3A80%2F2');
+
+                this.appendChildStub.reset();
+
+                Raven
+                    .config(SENTRY_DSN)
+                    .captureException(new Error('foo')) // generates lastEventId
+                    .showReportDialog();
+
+                this.appendChildStub.getCall(0).args[0];
+                assert.equal(script.src, 'http://example.com/api/embed/error-page/?eventId=abc123&dsn=http%3A%2F%2Fabc%40example.com%3A80%2F2');
+            });
+
+            it('should specify embed API endpoint and full query string (DSN, eventId, user)', function () {
+                Raven.showReportDialog({
+                    eventId: 'abc123',
+                    dsn: SENTRY_DSN,
+                    user: {
+                        name: 'Average Normalperson',
+                        email: 'an@example.com'
+                    }
+                });
+
+                var script = this.appendChildStub.getCall(0).args[0];
+                assert.equal(script.src, 'http://example.com/api/embed/error-page/?eventId=abc123&dsn=http%3A%2F%2Fabc%40example.com%3A80%2F2&name=Average%20Normalperson&email=an%40example.com');
+
+                this.appendChildStub.reset();
+                Raven
+                    .config(SENTRY_DSN)
+                    .captureException(new Error('foo')) // generates lastEventId
+                    .setUserContext({
+                        name: 'Average Normalperson 2',
+                        email: 'an2@example.com'
+                    })
+                    .showReportDialog();
+
+                var script = this.appendChildStub.getCall(0).args[0];
+                assert.equal(script.src, 'http://example.com/api/embed/error-page/?eventId=abc123&dsn=http%3A%2F%2Fabc%40example.com%3A80%2F2&name=Average%20Normalperson%202&email=an2%40example.com');
+            });
+        });
+    });
 });