aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHubert SABLONNIÈRE2013-09-18 12:14:56 +0100
committerPete Bacon Darwin2013-09-18 12:34:25 +0100
commit094580c3da4272390aedbcb4921a4e9fed55cf2e (patch)
treef89d8f18827c312a4c02f80efb061e307b38ef72
parentcc4d08c5f0b895c0f011ea2e49e3ffaeb2e1b139 (diff)
downloadangular.js-094580c3da4272390aedbcb4921a4e9fed55cf2e.tar.bz2
fix(scenario): include "not " in error messages if test is inverted
Closes #3840
-rw-r--r--src/ngScenario/Scenario.js10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ngScenario/Scenario.js b/src/ngScenario/Scenario.js
index 4833e629..801e19fc 100644
--- a/src/ngScenario/Scenario.js
+++ b/src/ngScenario/Scenario.js
@@ -69,18 +69,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);