Skip to content

Commit

Permalink
fixed up the unit tests so that they only test the plugin's usage of …
Browse files Browse the repository at this point in the history
…the zoom methods, not the result of whether those methods are working
  • Loading branch information
scottjehl committed Jan 24, 2012
1 parent 2937321 commit 79b1979
Showing 1 changed file with 9 additions and 31 deletions.
40 changes: 9 additions & 31 deletions tests/unit/fixedToolbar/fixedToolbar.js
Expand Up @@ -4,14 +4,6 @@
(function($){
module('jquery.mobile.fixedToolbar.js');

var defaultMeta = "width=device-width, initial-scale=1";

function injectMeta( content ){
content = content || defaultMeta;
$( "meta[name=viewport]" ).remove();
$( "<meta name='viewport' content='"+ content +"'>" ).prependTo( "head" );
}

$( "html" ).height( screen.height * 3 );

function scrollDown(){
Expand All @@ -23,8 +15,7 @@
}


// add meta viewport tag
injectMeta();


test( "Fixed Header Structural Classes are applied correctly", function(){

Expand Down Expand Up @@ -80,35 +71,22 @@
], 500);

});

test( "User zooming is disabled when the header is visible", function(){
injectMeta();
ok( $( "meta[name=viewport]" ).attr( "content" ).indexOf( ", user-scalable=no" ) < 0, "The meta viewport tag's content does not contain , user-scalable=no by default" );
$.mobile.zoom.enable();
$( ".ui-page-active" ).trigger( "pagebeforeshow" );
ok( $( "meta[name=viewport]" ).attr( "content" ).indexOf( ", user-scalable=no" ) > -1, "After pagebeforeshow, the meta viewport tag's content contains , user-scalable=no" );

ok( !$.mobile.zoom.enabled, "Viewport scaling is disabled before page show." );
});

test( "Meta viewport content is restored to previous state, and zooming renabled, after pagehide", function(){
injectMeta();
ok( $( "meta[name=viewport]" ).attr( "content" ).indexOf( ", user-scalable=no" ) < 0, "The meta viewport tag's content does not contain , user-scalable=no by default" );
$.mobile.zoom.enable();
$( ".ui-page-active" ).trigger( "pagebeforeshow" );
ok( $( "meta[name=viewport]" ).attr( "content" ).indexOf( ", user-scalable=no" ) > -1, "After pagebeforeshow, the meta viewport tag's content contains , user-scalable=no" );
ok( !$.mobile.zoom.enabled, "Viewport scaling is disabled before page show." );
$( ".ui-page-active" ).trigger( "pagehide" );
ok( $( "meta[name=viewport]" ).attr( "content" ).indexOf( ", user-scalable=no" ) < 0, "After pagehide, the meta viewport tag's content does not contain , user-scalable=no by default" );
ok( $( "meta[name=viewport]" ).attr( "content" ) == defaultMeta, "After pagehide, meta viewport content is restored to previous state" );
$( ".ui-page-active" ).trigger( "pageshow" );
});

test( "disablePageZoom and restorePageZoom methods properly toggle user-scalable=no on the meta viewport tag", function(){
injectMeta();
$( '#classes-test-b' ).fixedtoolbar( "disablePageZoom" );
ok( $( "meta[name=viewport]" ).attr( "content" ).indexOf( ", user-scalable=no" ) > -1, "After pagebeforeshow, the meta viewport tag's content contains , user-scalable=no" );
$( '#classes-test-b' ).fixedtoolbar( "restorePageZoom" );
ok( $( "meta[name=viewport]" ).attr( "content" ) == defaultMeta, "After calling restorePageZoom, meta viewport content is restored to previous state" );
ok( $.mobile.zoom.enabled, "Viewport scaling is enabled." );

});



asyncTest( "The hide method is working properly", function() {

expect( 2 );
Expand Down

0 comments on commit 79b1979

Please sign in to comment.