Changes to get the navigation_core and navigation_helpers tests to pass again:

- Modified changePage() click test so that it expects changePage() to be called twice.
- Added changePage() test that makes sure it is called once when it is invoked with a page element instead of a URL.
- Added siteDirectory path to be used with some tests which assumed that the tests directory was at the top-level of the server site.

Author: jblas

tests/unit/navigation/navigation_core.js

@@ -3,7 +3,8 @@
  */
 (function($){
 	var changePageFn = $.mobile.changePage,
-			originalTitle = document.title;
+			originalTitle = document.title,
+			siteDirectory = location.pathname.replace(/[^/]+$/, "");
 	module('jquery.mobile.navigation.js', {
 		setup: function(){
 			$.mobile.urlHistory.stack = [];
@@ -14,7 +15,7 @@
 		}
 	});
 
-	asyncTest( "changepage will only run once when a new page is visited", function(){
+	asyncTest( "changepage runs once when called with an element", function(){
 		var called = 0,
 				newChangePage = function(a,b,c,d,e){
 					changePageFn( a,b,c,d,e );
@@ -25,11 +26,33 @@
 			// avoid initial page load triggering changePage early
 			function(){
 				$.mobile.changePage = newChangePage;
-				$('#foo a').click();
+				newChangePage($("#bar"));
 			},
 
 			function(){
 				ok(called == 1, "change page should be called once");
+				$.mobile.changePage = changePageFn;
+				start();
+			}], 500);
+	});
+
+	asyncTest( "changepage runs twice when triggered by a link", function(){
+		var called = 0,
+				newChangePage = function(a,b,c,d,e){
+					changePageFn( a,b,c,d,e );
+					called ++;
+				};
+
+		$.testHelper.sequence([
+			// avoid initial page load triggering changePage early
+			function(){
+				$.mobile.changePage = newChangePage;
+				$('#foo a').click();
+			},
+
+			function(){
+				ok(called == 2, "change page should be called twice");
+				$.mobile.changePage = changePageFn;
 				start();
 			}], 500);
 	});
@@ -166,7 +189,7 @@
 	};
 
 	test( "when loading a page where data-url is not defined on a sub element hash defaults to the url", function(){
-		testDataUrlHash("#non-data-url a", new RegExp("^#/tests/unit/navigation/data-url-tests/non-data-url.html$"));
+		testDataUrlHash("#non-data-url a", new RegExp("^#" + siteDirectory + "data-url-tests/non-data-url.html$"));
 	});
 
 	test( "data url works for nested paths", function(){

tests/unit/navigation/navigation_helpers.js

@@ -2,6 +2,8 @@
  * mobile navigation unit tests
  */
 (function($){
+	var siteDirectory = location.pathname.replace(/[^/]+$/, "");
+
 	module('jquery.mobile.navigation.js', {
 		setup: function(){
 			location.hash = "";
@@ -40,16 +42,16 @@
 		same( $.mobile.path.makeAbsolute("test.html"), "bar/test.html", "prefixes path with absolute base path from hash");
 
 		$.mobile.path.set("bar");
-		same( $.mobile.path.makeAbsolute("test.html"), "/tests/unit/navigation/test.html", "returns the absolute path unaltered ignoring non path hash");
+		same( $.mobile.path.makeAbsolute("test.html"), siteDirectory + "test.html", "returns the absolute path unaltered ignoring non path hash");
 
 		$.mobile.path.set("bar/bing/bang");
 		same( $.mobile.path.makeAbsolute("?foo=bar&bak=baz"), "bar/bing/bang?foo=bar&bak=baz", "appends query string paths to current path");
 
 		$.mobile.path.set("");
-		same( $.mobile.path.makeAbsolute("?foo=bar&bak=baz"), "/tests/unit/navigation/?foo=bar&bak=baz", "uses pathname for empty hash");
+		same( $.mobile.path.makeAbsolute("?foo=bar&bak=baz"), siteDirectory + "?foo=bar&bak=baz", "uses pathname for empty hash");
 
 		$.mobile.path.set("bar");
-		same( $.mobile.path.makeAbsolute("?foo=bar&bak=baz"), "/tests/unit/navigation/?foo=bar&bak=baz", "uses pathname for embedded pages");
+		same( $.mobile.path.makeAbsolute("?foo=bar&bak=baz"), siteDirectory + "?foo=bar&bak=baz", "uses pathname for embedded pages");
 
 		$.mobile.path.set("bar/bing?foo=bar");
 		same( $.mobile.path.makeAbsolute("?foo=bar&bak=baz"), "bar/bing?foo=bar&bak=baz", "prevents addition of many sets of query params");