aboutsummaryrefslogtreecommitdiffstats
path: root/src/markups.js
diff options
context:
space:
mode:
authorVojta Jina2011-07-12 02:18:46 +0200
committerVojta Jina2011-09-08 23:00:59 +0200
commit4421f3d43525437bd939f647604480c1ed126e5e (patch)
treeb27657098ccf4395827871533ba8bb2b5a90e7fc /src/markups.js
parent22cb600280cecabf719ba1878719c907aa01ba18 (diff)
downloadangular.js-4421f3d43525437bd939f647604480c1ed126e5e.tar.bz2
fix(docs): update docs to reflect new $location and fix e2e tests
Diffstat (limited to 'src/markups.js')
-rw-r--r--src/markups.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/markups.js b/src/markups.js
index 933d91f4..d3af25b4 100644
--- a/src/markups.js
+++ b/src/markups.js
@@ -166,10 +166,10 @@ angularTextMarkup('option', function(text, textNode, parentElement){
<input name="value" /><br />
<a id="link-1" href ng:click="value = 1">link 1</a> (link, don't reload)<br />
<a id="link-2" href="" ng:click="value = 2">link 2</a> (link, don't reload)<br />
- <a id="link-3" ng:href="#{{'123'}}" ng:click="value = 3">link 3</a> (link, reload!)<br />
+ <a id="link-3" ng:href="#!/{{'123'}}" ng:click="value = 3">link 3</a> (link, reload!)<br />
<a id="link-4" href="" name="xx" ng:click="value = 4">anchor</a> (link, don't reload)<br />
<a id="link-5" name="xxx" ng:click="value = 5">anchor</a> (no link)<br />
- <a id="link-6" ng:href="#/{{value}}">link</a> (link, change hash)
+ <a id="link-6" ng:href="#!/{{value}}">link</a> (link, change hash)
</doc:source>
<doc:scenario>
it('should execute ng:click but not reload when href without value', function() {
@@ -187,8 +187,8 @@ angularTextMarkup('option', function(text, textNode, parentElement){
it('should execute ng:click and change url when ng:href specified', function() {
element('#link-3').click();
expect(input('value').val()).toEqual('3');
- expect(element('#link-3').attr('href')).toBe("#123");
- expect(browser().location().hash()).toEqual('123');
+ expect(element('#link-3').attr('href')).toBe("#!/123");
+ expect(browser().location().hash()).toEqual('!/123');
});
it('should execute ng:click but not reload when href empty string and name specified', function() {
@@ -206,8 +206,8 @@ angularTextMarkup('option', function(text, textNode, parentElement){
it('should only change url when only ng:href', function() {
input('value').enter('6');
element('#link-6').click();
- expect(browser().location().hash()).toEqual('/6');
- expect(element('#link-6').attr('href')).toBe("#/6");
+ expect(browser().location().hash()).toEqual('!/6');
+ expect(element('#link-6').attr('href')).toBe("#!/6");
});
</doc:scenario>
</doc:example>