From 2961ebc7fa2f5f4b38200c020dcf0aaff160e337 Mon Sep 17 00:00:00 2001 From: Trek Glowacki Date: Tue, 18 Oct 2016 15:07:53 -0500 Subject: [PATCH] Warn, don't raise, a double started Pretender --- .jshintrc | 3 +++ pretender.js | 5 +++-- test/creation_test.js | 20 -------------------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.jshintrc b/.jshintrc index b5e7b70..e678534 100644 --- a/.jshintrc +++ b/.jshintrc @@ -6,6 +6,9 @@ "define", "process" ], + "globals": { + "console":false + }, "expr": true, "proto": true, "strict": true, diff --git a/pretender.js b/pretender.js index 876ae58..b40e3ff 100644 --- a/pretender.js +++ b/pretender.js @@ -261,8 +261,9 @@ function interceptor(pretender, nativeRequest) { FakeRequest.prototype = proto; if (nativeRequest.prototype._passthroughCheck) { - throw new Error('You created a second Pretender instance while there was already one running. ' + - 'Running two Pretender servers at once will lead to unexpected results!' + + console.warn('You created a second Pretender instance while there was already one running. ' + + 'Running two Pretender servers at once will lead to unexpected results and will ' + + 'be removed entirely in a future major version.' + 'Please call .shutdown() on your instances when you no longer need them to respond.'); } return FakeRequest; diff --git a/test/creation_test.js b/test/creation_test.js index 095c9f4..26e98e9 100644 --- a/test/creation_test.js +++ b/test/creation_test.js @@ -2,26 +2,6 @@ var pretender; var describe = QUnit.module; var it = QUnit.test; -describe('pretender creation - without shutdown', function(config) { - var secondPretender; - - config.beforeEach(function() { - pretender = new Pretender(); - }); - - config.afterEach(function() { - pretender.shutdown(); - }); - - test('an error is thrown when you start a new pretender while another one is running', function(assert) { - var message = 'You created a second Pretender instance while there ' + - 'already one running. Running two Pretender servers at once will lead to unexpected results!'; - assert.throws(function() { - new Pretender(); - }, message); - }); -}); - describe('pretender creation', function(config) { config.afterEach(function() { if (pretender) {