diff options
Diffstat (limited to 'test/helpers')
| -rw-r--r-- | test/helpers/matchers.js | 12 | ||||
| -rw-r--r-- | test/helpers/privateMocksSpec.js | 2 |
2 files changed, 7 insertions, 7 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; diff --git a/test/helpers/privateMocksSpec.js b/test/helpers/privateMocksSpec.js index e58a2b75..d5a1e188 100644 --- a/test/helpers/privateMocksSpec.js +++ b/test/helpers/privateMocksSpec.js @@ -9,7 +9,7 @@ describe('private mocks', function() { var stylesheet = createMockStyleSheet($document, $window); expect(doc.styleSheets.length).toBe(count + 1); - jqLite(doc.body).append($rootElement); + angular.element(doc.body).append($rootElement); var elm = $compile('<div class="padded">...</div>')($rootScope); $rootElement.append(elm); |
