Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-04-26 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(scenario): include "not " in error messages if test is inverted

Browse source 
Closes #3840
This commit is contained in:
Hubert SABLONNIÈRE 2013-09-18 12:14:56 +01:00 committed by Pete Bacon Darwin
parent cc4d08c5f0
commit 094580c3da
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ngScenario/Scenario.js
View file

@ -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 = angular.scenario.matcher || function(name, fn) {
angular.scenario.matcher[name] = function(expected) { angular.scenario.matcher[name] = function(expected) {
var prefix = 'expect ' + this.future.name + ' '; var prefix = 'expect ' + this.future.name + ' ',
if (this.inverse) { not = this.inverse && 'not ';
prefix += 'not ';
}
var self = this; var self = this;
this.addFuture(prefix + name + ' ' + angular.toJson(expected), this.addFuture(prefix + not + name + ' ' + angular.toJson(expected),
function(done) { function(done) {
var error; var error;
self.actual = self.future.value; self.actual = self.future.value;
if ((self.inverse && fn.call(self, expected)) || if ((self.inverse && fn.call(self, expected)) ||
(!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); ' but was ' + angular.toJson(self.actual);
} }
done(error); done(error);