Popup unit tests: Add test for checking whether popup goes back two history entries instead of just one.

Gabriel Schulhof · Gabriel Schulhof · commit 3d7ef95d8930 · 2012-12-01T01:37:49.000+02:00
diff --git a/tests/unit/popup/back-two.html b/tests/unit/popup/back-two.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8"></meta>
+	</head>
+	<body>
+  <div data-nstest-role="page" id="another-page">
+    <div data-nstest-role="popup" id="back-twice-test-popup">
+      <p>Back twice test popup</p>
+    </div>
+    <a id="open-back-twice-test-popup" href="#back-twice-test-popup" data-nstest-rel="popup">Pop</a>
+  </div>
+	</body>
+</html>
diff --git a/tests/unit/popup/index.html b/tests/unit/popup/index.html
@@ -14,6 +14,16 @@
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
 	<script src="../../../external/qunit.js"></script>
+	<script>
+		( function( $, undefined ) {
+			// Set the default transition to "fade" if specified in the query
+			if ( !!~location.search.indexOf( "setFadeTransition" ) ) {
+				$( document ).one( "mobileinit", function() {
+					$.mobile.popup.prototype.options.transition = "fade";
+				});
+			}
+		})( jQuery );
+	</script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -33,7 +43,7 @@
 <body>
   <div id="qunit"></div>
 
-  <div data-nstest-role="page">
+  <div data-nstest-role="page" id="start-page">
     <div data-nstest-role="content" id="page-content">
       <div data-nstest-role="popup" id="test-popup">
         <p>This is the test popup</p>
@@ -66,6 +76,7 @@
       <div data-nstest-role="popup" id="test-popup-dismissible" data-nstest-dismissible="false">
         <p>This is the test popup</p>
       </div>
+      <a id="go-to-another-page" href="back-two.html">Go</a>
     </div>
   </div>
 
diff --git a/tests/unit/popup/popup_core.js b/tests/unit/popup/popup_core.js
@@ -78,6 +78,52 @@
 		ok( $container.children().is( $payload ), "After destroying on-the-fly popup, its payload is returned to its original location" );
 	});
 
+	asyncTest( "Popup does not go back in history twice when opening on separate page", function() {
+		var eventNs = ".backTwice", popup = function() { return $( "#back-twice-test-popup" ); };
+		$.testHelper.detailedEventCascade([
+			function() {
+				$( "#go-to-another-page" ).click();
+			},
+			{
+				navigate: { src: $( document ), event: "navigate" + eventNs + "1" },
+				pagechange: { src: $.mobile.pageContainer, event: "pagechange" + eventNs + "1" }
+			},
+			function() {
+				deepEqual( $.mobile.activePage.attr( "id" ), "another-page", "Reached another page" );
+				$( "#open-back-twice-test-popup" ).click();
+			},
+			{
+				popupafteropen: { src: popup, event: "popupafteropen" + eventNs + "2" },
+				navigate: { src: $(document), event: "navigate" + eventNs + "2" }
+			},
+			function( result ) {
+				deepEqual( result.popupafteropen.timedOut, false, "popupafteropen event did arrive" );
+				deepEqual( result.navigate.timedOut, false, "navigate event did arrive" );
+				$( "#back-twice-test-popup-screen" ).click();
+			},
+			{
+				popupafterclose: { src: popup, event: "popupafterclose" + eventNs + "3" },
+				navigate: { src: $( document ), event: "navigate" + eventNs + "3" },
+				pagechange: { src: $( document ), event: "pagechange" + eventNs + "3" }
+			},
+			function( result ) {
+				deepEqual( result.popupafterclose.timedOut, false, "popupafterclose event did arrive" );
+				deepEqual( result.navigate.timedOut, false, "navigate event did arrived" );
+				deepEqual( result.pagechange.timedOut, false, "pagechange event did arrive" );
+				deepEqual( $.mobile.activePage.attr( "id" ), "another-page", "Back to another page" );
+				$.mobile.back();
+			},
+			{
+				navigate: { src: $( document ), event: "navigate" + eventNs + "4" }
+			},
+			function( result ) {
+				deepEqual( result.navigate.timedOut, false, "navigate event did arrive" );
+				deepEqual( $.mobile.activePage.attr( "id" ), "start-page", "Back to start page" );
+				start();
+			}
+		]);
+	});
+
 	asyncTest( "Popup opens and closes", function() {
 		var $popup = $( "#test-popup" );
 		expect( 9 );
