aboutsummaryrefslogtreecommitdiffstats
path: root/test/ng
diff options
context:
space:
mode:
authorOren Avissar2013-04-22 21:00:15 -0700
committerPete Bacon Darwin2013-04-29 16:56:35 +0100
commit0985a37376314616ac2b777bddd8bc07e1be7af7 (patch)
tree1dcf30472b14bde43b6ca889a855b89a3714302d /test/ng
parentcb62a57d438f94dff32218ba095a6a63b1db958f (diff)
downloadangular.js-0985a37376314616ac2b777bddd8bc07e1be7af7.tar.bz2
test(browser/compile): fix calls to Jasmine fail()
The fail() function in Jasmine expects an Error object parameter. Also, there is no global alias for fail() so it must be accessed using `this.fail(new Error())`.
Diffstat (limited to 'test/ng')
-rwxr-xr-x[-rw-r--r--]test/ng/browserSpecs.js4
-rwxr-xr-x[-rw-r--r--]test/ng/compileSpec.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/test/ng/browserSpecs.js b/test/ng/browserSpecs.js
index e989330b..eba9bd02 100644..100755
--- a/test/ng/browserSpecs.js
+++ b/test/ng/browserSpecs.js
@@ -271,8 +271,8 @@ describe('browser', function() {
browser.cookies('x', longVal + longVal + longVal); //should be too long for all browsers
if (document.cookie !== cookieStr) {
- fail("browser didn't drop long cookie when it was expected. make the cookie in this " +
- "test longer");
+ this.fail(new Error("browser didn't drop long cookie when it was expected. make the " +
+ "cookie in this test longer"));
}
expect(browser.cookies().x).toEqual('shortVal');
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
index 9614030c..26f61357 100644..100755
--- a/test/ng/compileSpec.js
+++ b/test/ng/compileSpec.js
@@ -540,8 +540,8 @@ describe('$compile', function() {
it('should prevent multiple templates per element', inject(function($compile) {
try {
- $compile('<div><span replace class="replace"></span></div>')
- fail();
+ $compile('<div><span replace class="replace"></span></div>');
+ this.fail(new Error('should have thrown Multiple directives error'));
} catch(e) {
expect(e.message).toMatch(/Multiple directives .* asking for template/);
}