diff --git a/tests/unit/ls.php b/tests/unit/ls.php index 6bcd1d72..2108b544 100644 --- a/tests/unit/ls.php +++ b/tests/unit/ls.php @@ -13,6 +13,8 @@ closedir($handle); } - sort($directories); - echo json_encode( array('directories' => $directories )); + $test_pages = array_merge($directories, glob("**/*-tests.html")); + sort($test_pages); + + echo json_encode( array('testPages' => $test_pages)); ?> \ No newline at end of file diff --git a/tests/unit/runner.js b/tests/unit/runner.js index c0c89aa4..aa956e4c 100644 --- a/tests/unit/runner.js +++ b/tests/unit/runner.js @@ -58,7 +58,7 @@ $(function() { exec: function( data ) { var template = self.$frameElem.attr( "data-src" ); - $.each( data.directories, function(i, dir) { + $.each( data.testPages, function(i, dir) { QUnit.asyncTest( dir, function() { self.dir = dir; self.$frameElem.one( "load", self.onFrameLoad ); diff --git a/tests/unit/select/cached-tests.html b/tests/unit/select/cached.html similarity index 100% rename from tests/unit/select/cached-tests.html rename to tests/unit/select/cached.html diff --git a/tests/unit/select/select_core.js b/tests/unit/select/select_core.js index ec462613..ea804997 100644 --- a/tests/unit/select/select_core.js +++ b/tests/unit/select/select_core.js @@ -261,7 +261,7 @@ resetHash, function(){ - $.mobile.changePage( "cached-tests.html" ); + $.mobile.changePage( "cached.html" ); }, function(){ @@ -293,7 +293,7 @@ resetHash, function(){ - $.mobile.changePage( "cached-tests.html" ); + $.mobile.changePage( "cached.html" ); }, function(){