From 3589f17824376e9db4e8d002caeb4483943eeb18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hubert=20SABLONNI=C3=88RE?= Date: Wed, 18 Sep 2013 12:14:56 +0100 Subject: [PATCH] fix(scenario): include "not " in error messages if test is inverted Closes #3840 --- src/ngScenario/Scenario.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ngScenario/Scenario.js b/src/ngScenario/Scenario.js index ff5f3470245f..36cc7c0c3354 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);