Unit tests: fixing final tests for switching to toolbar widget

Author: arschmitz

js/jquery.mobile.core.js

@@ -172,7 +172,6 @@ define( [ "jquery", "./jquery.mobile.ns", "json!../package.json" ], function( jQ
 				ltr = "",
 				re = /ui-(bar|body|overlay)-([a-z])\b/,
 				c, m;
-
 			while ( e ) {
 				c = e.className || "";
 				if ( c && ( m = re.exec( c ) ) && ( ltr = m[ 2 ] ) ) {
@@ -183,10 +182,8 @@ define( [ "jquery", "./jquery.mobile.ns", "json!../package.json" ], function( jQ
 
 				e = e.parentNode;
 			}
-
 			// Return the theme letter we found, if none, return the
 			// specified default.
-
 			return ltr || defaultTheme || "a";
 		},
 

js/widgets/page.js

@@ -39,8 +39,9 @@ $.widget( "mobile.page", $.mobile.widget, {
 			pagebeforeshow: "_handlePageBeforeShow"
 		});
 		this.element.find("["+attrPrefix+"role='content']").each( function(){
-			var $this = $( this );
-				self.options.contentTheme = self.options.theme || self.options.contentTheme || ( self.element.jqmData("role") === "dialog" &&  self.options.theme );
+			var $this = $( this ),
+				theme = this.getAttribute( attrPrefix + "theme" ) || undefined;
+				self.options.contentTheme = theme || self.options.contentTheme || ( self.element.jqmData("role") === "dialog" &&  self.options.theme );
 				$this.addClass("ui-content");
 				if ( self.options.contentTheme ) {
 					$this.addClass( "ui-body-" + ( self.options.contentTheme ) );

tests/integration/dialog/dialog_events.js

@@ -7,7 +7,7 @@
 
 	module( "jquery.mobile.dialog.js", {
 		setup: function() {
-			$.mobile.page.prototype.options.contentTheme = "c";
+			$.mobile.page.prototype.options.contentTheme = "d";
 			$.testHelper.navReset( homeWithSearch );
 		}
 	});
@@ -179,7 +179,6 @@
 
 			function() {
 				var dialog = $( "#dialog-c" );
-
 				// Assert dialog theme inheritance (issue 1375):
 				ok( dialog.hasClass( "ui-body-e" ), "Expected explicit theme ui-body-e" );
 				ok( dialog.hasClass( "ui-overlay-b" ), "Expected explicit theme ui-overlay-b" );

tests/unit/button/button_core.js

@@ -38,7 +38,7 @@
 		var $inherited = $( "#theme-check" ),
 		    $explicit = $( "#theme-check-explicit" );
 
-		ok( $inherited.closest("div").hasClass( "ui-btn-up-a" ), "should inherit from page" );
+		ok( $inherited.closest("div").hasClass( "ui-btn-up-p" ), "should inherit from content" );
 		ok( $explicit.closest("div").hasClass( "ui-btn-up-b" ), "should not inherit" );
 	});
 

tests/unit/fixed-toolbar/index.html

@@ -16,7 +16,6 @@
 			[
 		        "navigation/method",
 		        "jquery.mobile.buttonMarkup",
-		        "widgets/page",
 		        "widgets/toolbar",
 		        "widgets/fixedToolbar"
 			],

tests/unit/page-sections/index.html

@@ -14,8 +14,7 @@
 	<script>
 		$.testHelper.asyncLoad([
 			[
-				"widgets/page",
-				"widgets/page.sections"
+				"widgets/toolbar"
 			],
 			[
 				"jquery.mobile.buttonMarkup",