From 01d6d4c1db9b236adaff964fc5b68ddf2c80e669 Mon Sep 17 00:00:00 2001 From: Andrew Morris Date: Wed, 22 Mar 2017 01:34:19 +1100 Subject: [PATCH] fix(client: return result of confirm and prompt --- context/karma.js | 4 ++-- test/client/karma.spec.js | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/context/karma.js b/context/karma.js index 681c556b8..aac5a396f 100644 --- a/context/karma.js +++ b/context/karma.js @@ -89,12 +89,12 @@ var ContextKarma = function (callParentKarmaMethod) { contextWindow.confirm = function (msg) { self.log('confirm', [msg]) - _confirm(msg) + return _confirm(msg) } contextWindow.prompt = function (msg, defaultVal) { self.log('prompt', [msg, defaultVal]) - _prompt(msg, defaultVal) + return _prompt(msg, defaultVal) } // If we want to overload our console, then do it diff --git a/test/client/karma.spec.js b/test/client/karma.spec.js index ee072d755..b041633b1 100644 --- a/test/client/karma.spec.js +++ b/test/client/karma.spec.js @@ -261,13 +261,15 @@ describe('Karma', function () { var mockWindow = { confirm: function () { confirmCalled = true + return true } } ck.setupContext(mockWindow) - mockWindow.confirm('What?') + var confirmResult = mockWindow.confirm('What?') assert(ck.log.calledWith('confirm', ['What?'])) assert.equal(confirmCalled, true) + assert.equal(confirmResult, true) }) it('should capture prompt', function () { @@ -277,13 +279,15 @@ describe('Karma', function () { var mockWindow = { prompt: function () { promptCalled = true + return 'user-input' } } ck.setupContext(mockWindow) - mockWindow.prompt('What is your favorite color?', 'blue') + var promptResult = mockWindow.prompt('What is your favorite color?', 'blue') assert(ck.log.calledWith('prompt', ['What is your favorite color?', 'blue'])) assert.equal(promptCalled, true) + assert.equal(promptResult, 'user-input') }) })