Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-04-17 12:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix url checks to use search where appropriate

Browse source
This commit is contained in:
John Bender 2012-01-04 08:02:31 -08:00 committed by scottjehl
parent 00b7c85b4f
commit 7ba4547aa3
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/unit/navigation/index.html
View file

@ -7,23 +7,21 @@
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../js/"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script type="text/javascript">
$.testHelper.setPushState();
$.testHelper.stubDefine();
</script>
<link rel="stylesheet" href="../../../css/themes/default/"/>
<script src="../../../js/"></script>
<link rel="stylesheet" href="../../../css/themes/default/"/>
<link rel="stylesheet" href="../../../external/qunit.css"/>
<script src="../../../external/qunit.js"></script>
<script type="text/javascript">
$.testHelper.setPushStateFor([
"navigation_transitions.js",
"navigation_helpers.js",
"navigation_core.js",
"navigation_paths.js"
]);
</script>
<script type="text/javascript" src="navigation_transitions.js"></script>
<script type="text/javascript" src="navigation_helpers.js"></script>
<script type="text/javascript" src="navigation_paths.js"></script>
<script type="text/javascript" src="navigation_core.js"></script>
<script src="../swarminject.js"></script>
</head>
<body>

7
tests/unit/navigation/navigation_core.js
View file

@ -8,6 +8,7 @@
originalLinkBinding = $.mobile.linkBindingEnabled,
siteDirectory = location.pathname.replace( /[^/]+$/, "" ),
home = $.mobile.path.parseUrl(location.pathname).directory,
homeWithSearch = home + location.search,
navigateTestRoot = function(){
$.testHelper.openPage( "#" + location.pathname + location.search );
};
@ -426,7 +427,7 @@
function(){
$.testHelper.assertUrlLocation({
hash: "skip-dialog-first",
push: home + "#skip-dialog-first",
push: homeWithSearch + "#skip-dialog-first",
report: "should be the first page in the sequence"
});
@ -455,7 +456,7 @@
function(){
$.testHelper.assertUrlLocation({
hash: "skip-dialog-second",
push: home + "#skip-dialog-second",
push: homeWithSearch + "#skip-dialog-second",
report: "should be the second page after the dialog"
});
@ -753,7 +754,7 @@
function(){
$.testHelper.assertUrlLocation({
hash: "foo&ui-state=dialog",
push: home + "#foo&ui-state=dialog",
push: homeWithSearch + "#foo&ui-state=dialog",
report: "hash should match what was loaded"
});