Skip to content

Commit

Permalink
Remove the pageinit stuff, we're getting that for free from asyncLoad…
Browse files Browse the repository at this point in the history 
…. Saw some weird timing issues when reusing the same panel and asyncTests, so we're using different panels for each test (per @johnbender's recommendation).
  • Loading branch information
@zachleat
zachleat committed Jan 4, 2013
1 parent 5ab2ba6 commit 6b9c017
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 51 deletions.
36 changes: 31 additions & 5 deletions tests/unit/panel/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
</script>
<script>
$.testHelper.asyncLoad([
[
"widgets/panel"
],
[ "widgets/panel" ],
[ "jquery.mobile.init" ],
[ "panel_core.js" ]
]);
Expand All @@ -40,7 +38,28 @@ <h2 id="qunit-userAgent"></h2>
</ol>

<div data-nstest-role="page">
<div data-nstest-role="panel" id="panel-test-stock">
<div data-nstest-role="panel" id="panel-test-create">
<p>Contents of a panel.</p>
</div>
<div data-nstest-role="panel" id="panel-test-events">
<p>Contents of a panel.</p>
</div>
<div data-nstest-role="panel" id="panel-test-open">
<p>Contents of a panel.</p>
</div>
<div data-nstest-role="panel" id="panel-test-close">
<p>Contents of a panel.</p>
</div>
<div data-nstest-role="panel" id="panel-test-toggle">
<p>Contents of a panel.</p>
</div>
<div data-nstest-role="panel" id="panel-test-wrapper">
<p>Contents of a panel.</p>
</div>
<div data-nstest-role="panel" id="panel-test-dismiss">
<p>Contents of a panel.</p>
</div>
<div data-nstest-role="panel" id="panel-test-destroy">
<p>Contents of a panel.</p>
</div>
<div data-nstest-role="panel" id="panel-test-non-default-theme" data-nstest-theme="c">
Expand All @@ -56,7 +75,14 @@ <h1>Panel Test</h1>
</div>
<div data-nstest-role="content">
<h1 id="demo-links">Panels</h1>
<a href="#panel-test-stock">Open Panel</a>
<a href="#panel-test-create">Open Panel</a>
<a href="#panel-test-events">Open Panel</a>
<a href="#panel-test-open">Open Panel</a>
<a href="#panel-test-close">Open Panel</a>
<a href="#panel-test-toggle">Open Panel</a>
<a href="#panel-test-wrapper">Open Panel</a>
<a href="#panel-test-dismiss">Open Panel</a>
<a href="#panel-test-destroy">Open Panel</a>
<a href="#panel-test-non-default-theme">Open Panel</a>
<a href="#panel-test-with-close">Open Panel</a>
</div>
Expand Down
88 changes: 42 additions & 46 deletions tests/unit/panel/panel_core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
* mobile panel unit tests
*/

// stop qunit from running the tests until everything is in the page
QUnit.config.autostart = false;

(function( $ ){

Expand All @@ -26,15 +24,11 @@ QUnit.config.autostart = false;
return $page.find( "." + defaults.classes.contentWrap );
}

$( document ).on( "pageinit", function(){
QUnit.start();
});

module( "stock panel");
module( "stock panel" );

test( "expected classes on create", function() {

var $panel = $( "#panel-test-stock" ),
var $panel = $( "#panel-test-create" ),
$page = getPageFromPanel( $panel );

ok( $panel.hasClass( defaults.classes.panel ), "default class is present" );
Expand All @@ -51,7 +45,7 @@ QUnit.config.autostart = false;

expect( 4 );

var $panel = $( "#panel-test-stock" );
var $panel = $( "#panel-test-events" );

$panel.one( "panelbeforeopen panelopen panelbeforeclose panelclose", function( event ) {
ok( true, event.type + " event." );
Expand All @@ -66,13 +60,13 @@ QUnit.config.autostart = false;
});

asyncTest( "classes modified by open", function() {
expect( 13 );
expect( 14 );

var $panel = $( "#panel-test-stock" ),
var $panel = $( "#panel-test-open" ),
$page = getPageFromPanel( $panel ),
$wrapper = getWrapperFromPage( $page ),
$modal = getModalFromPanel( $panel ),
$openButton = $page.find( "a[href='\\#panel-test-stock']" );
$openButton = $page.find( "a[href='\\#panel-test-open']" );

$panel.one( "panelopen", function( event ) {
ok( !$openButton.hasClass( $.mobile.activeBtnClass ), "button doesn't have active class" );
Expand All @@ -81,7 +75,9 @@ QUnit.config.autostart = false;
ok( !$panel.hasClass( defaults.classes.panelClosed ), "closed class removed" );
ok( $panel.hasClass( defaults.classes.panelOpen ), "open class added" );

equal( $wrapper.length, 1, "wrapper exists." );
ok( !$wrapper.hasClass( defaults.classes.contentWrapClosed ), "wrapper not closed class" );

ok( $wrapper.hasClass( defaults.classes.contentWrapOpen ), "wrapper open class" );

var prefix = defaults.classes.contentWrap;
Expand Down Expand Up @@ -112,11 +108,11 @@ QUnit.config.autostart = false;
asyncTest( "classes modified by close", function() {
expect( 12 );

var $panel = $( "#panel-test-stock" ),
var $panel = $( "#panel-test-close" ),
$page = getPageFromPanel( $panel ),
$wrapper = getWrapperFromPage( $page ),
$modal = getModalFromPanel( $panel ),
$openButton = $page.find( "a[href='\\#panel-test-stock']" );
$openButton = $page.find( "a[href='\\#panel-test-close']" );

$panel.one( "panelopen", function( event ) {
$panel.panel( "close" );
Expand Down Expand Up @@ -155,7 +151,7 @@ QUnit.config.autostart = false;
asyncTest( "toggle", function() {
expect( 2 );

var $panel = $( "#panel-test-stock" ),
var $panel = $( "#panel-test-toggle" ),
$page = getPageFromPanel( $panel );

$panel.one( "panelopen", function( event ) {
Expand All @@ -172,7 +168,7 @@ QUnit.config.autostart = false;

test( "wrapper exists after create", function() {

var $page = getPageFromPanel( $( "#panel-test-stock" ) ),
var $page = getPageFromPanel( $( "#panel-test-wrapper" ) ),
$wrapper = getWrapperFromPage( $page );

ok( $wrapper.length, "wrapper exists" );
Expand All @@ -182,38 +178,9 @@ QUnit.config.autostart = false;

// TODO _bindPageEvents

test( "dismissable", function() {

var $panel = $( "#panel-test-stock" );

equal( getModalFromPanel( $panel ).length, 1, "modal added to page" );
});

asyncTest( "click on dismissable modal closes panel", function() {

expect( 1 );

var $panel = $( "#panel-test-stock" ),
$modal = getModalFromPanel( $panel );

$panel.one( "panelopen", function() {

$modal.trigger( "mousedown" );

}).one( "panelclose", function() {

ok( true, "modal is closed" );
start();

});

$panel.panel( "open" );

});

test( "destroy method", function() {

var $panel = $( "#panel-test-stock" ),
var $panel = $( "#panel-test-destroy" ),
$page = getPageFromPanel( $panel ),
$wrapper = getWrapperFromPage( $page );

Expand All @@ -238,6 +205,35 @@ QUnit.config.autostart = false;
$panel.panel();
});

module( "dismissable panel" );

test( "dismissable", function() {
var $panel = $( "#panel-test-dismiss" );
equal( getModalFromPanel( $panel ).length, 1, "modal added to page" );
});

asyncTest( "click on dismissable modal closes panel", function() {

expect( 1 );

var $panel = $( "#panel-test-dismiss" ),
$modal = getModalFromPanel( $panel );

$panel.one( "panelopen", function() {

$modal.trigger( "mousedown" );

}).one( "panelclose", function() {

ok( true, "modal is closed" );
start();

});

$panel.panel( "open" );

});

module( "panel with non-default theme" );

test( "expected classes on create", function() {
Expand Down

1 comment on commit 6b9c017

@johnbender
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Please sign in to comment.