diff options
| author | Hubert SABLONNIÈRE | 2013-09-18 12:14:56 +0100 |
|---|---|---|
| committer | Pete Bacon Darwin | 2013-09-18 12:16:42 +0100 |
| commit | 3589f17824376e9db4e8d002caeb4483943eeb18 (patch) | |
| tree | a2164296f1a8cbd538782c8a68843cd5eb02dd92 | |
| parent | be0b4856699334ff51bacf2d1fd3394663d6bd28 (diff) | |
| download | angular.js-3589f17824376e9db4e8d002caeb4483943eeb18.tar.bz2 | |
fix(scenario): include "not " in error messages if test is inverted
Closes #3840
| -rw-r--r-- | src/ngScenario/Scenario.js | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ngScenario/Scenario.js b/src/ngScenario/Scenario.js index ff5f3470..36cc7c0c 100644 --- a/src/ngScenario/Scenario.js +++ b/src/ngScenario/Scenario.js @@ -74,18 +74,16 @@ angular.scenario.dsl = angular.scenario.dsl || function(name, fn) { */ angular.scenario.matcher = angular.scenario.matcher || function(name, fn) { angular.scenario.matcher[name] = function(expected) { - var prefix = 'expect ' + this.future.name + ' '; - if (this.inverse) { - prefix += 'not '; - } + var prefix = 'expect ' + this.future.name + ' ', + not = this.inverse && 'not '; var self = this; - this.addFuture(prefix + name + ' ' + angular.toJson(expected), + this.addFuture(prefix + not + name + ' ' + angular.toJson(expected), function(done) { var error; self.actual = self.future.value; if ((self.inverse && fn.call(self, expected)) || (!self.inverse && !fn.call(self, expected))) { - error = 'expected ' + angular.toJson(expected) + + error = 'expected ' + not + name + ' ' + angular.toJson(expected) + ' but was ' + angular.toJson(self.actual); } done(error); |
