aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMisko Hevery2013-05-06 14:53:45 -0700
committerMisko Hevery2013-05-06 21:52:53 -0700
commit2c69a6735e8af5d1b9b73fd221274d374e8efdea (patch)
treecbd98482b47b4f3e09c231eaf9f4c8247b930a7b /test
parentc575a56fc5c6abcb8442398b53ddd7ea2433b785 (diff)
downloadangular.js-2c69a6735e8af5d1b9b73fd221274d374e8efdea.tar.bz2
fix($location): prevent navigation when event isDefaultPrevented
Diffstat (limited to 'test')
-rw-r--r--test/ng/locationSpec.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/ng/locationSpec.js b/test/ng/locationSpec.js
index cf7ceaf4..c4a88fd9 100644
--- a/test/ng/locationSpec.js
+++ b/test/ng/locationSpec.js
@@ -835,6 +835,12 @@ describe('$location', function() {
jqLite(link).attr('href', 'http://host.com/base/');
browserTrigger(link, 'click');
expectRewriteTo($browser, 'http://host.com/base/');
+
+ jqLite(link).
+ attr('href', 'http://host.com/base/foo').
+ bind('click', function(e) { e.preventDefault(); });
+ browserTrigger(link, 'click');
+ expect($browser.url()).toBe('http://host.com/base/');
}
);
});
@@ -1372,6 +1378,7 @@ describe('$location', function() {
expect(location.$$rewrite('http://other')).toEqual(undefined);
expect(location.$$rewrite('http://server/pre/')).toEqual('http://server/pre/');
expect(location.$$rewrite('http://server/pre/#otherPath')).toEqual('http://server/pre/#otherPath');
+ expect(location.$$rewrite('javascript:void(0)')).toEqual(undefined);
});
});