diff options
| author | Pete Bacon Darwin | 2013-10-10 09:11:21 +0100 | 
|---|---|---|
| committer | Igor Minar | 2013-10-10 11:58:15 -0700 | 
| commit | 07272608d8ae39a5dd220cdb5637b1439342d5c3 (patch) | |
| tree | 7f0140b96fac88eee30cf94e01a9589cd25c8b37 /test/helpers/matchers.js | |
| parent | b019a48bb1176f3c9ce29b628a321b6ffe873393 (diff) | |
| download | angular.js-07272608d8ae39a5dd220cdb5637b1439342d5c3.tar.bz2 | |
fix(modules): stop leaking global variables in tests
The routeUtils.js file was declaring a number of functions that were
leaking into other modules such as ngMocks causing tests to pass
incorrectly.
Closes #4360
Diffstat (limited to 'test/helpers/matchers.js')
| -rw-r--r-- | test/helpers/matchers.js | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/test/helpers/matchers.js b/test/helpers/matchers.js index 14430b37..c5d7d6cf 100644 --- a/test/helpers/matchers.js +++ b/test/helpers/matchers.js @@ -74,11 +74,11 @@ beforeEach(function() {        this.message = function() {          var expected;          if (this.actual.message && this.actual.name == 'Error') { -          expected = toJson(this.actual.message); +          expected = angular.toJson(this.actual.message);          } else { -          expected = toJson(this.actual); +          expected = angular.toJson(this.actual);          } -        return "Expected " + expected + " to be an Error with message " + toJson(message); +        return "Expected " + expected + " to be an Error with message " + angular.toJson(message);        };        return this.actual.name == 'Error' && this.actual.message == message;      }, @@ -187,9 +187,9 @@ beforeEach(function() {          codeRegex = new RegExp('^\\[' + escapeRegexp(namespace) + ':' + escapeRegexp(code) + '\\]'),          not = this.isNot ? "not " : "",          regex = jasmine.isA_("RegExp", content) ? content : -                  isDefined(content) ? new RegExp(escapeRegexp(content)) : undefined; +                  angular.isDefined(content) ? new RegExp(escapeRegexp(content)) : undefined; -      if(!isFunction(this.actual)) { +      if(!angular.isFunction(this.actual)) {          throw new Error('Actual is not a function');        } @@ -215,7 +215,7 @@ beforeEach(function() {          return result;        } -      if (isDefined(regex)) { +      if (angular.isDefined(regex)) {          return regex.test(exceptionMessage);        }        return result; | 
