Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Commit

Permalink
move navigation tests to integration, make sure the whole suite passes
Browse files Browse the repository at this point in the history
  • Loading branch information
johnbender committed Mar 27, 2013
1 parent 944779f commit b4460e1
Show file tree
Hide file tree
Showing 114 changed files with 306 additions and 144 deletions.
4 changes: 2 additions & 2 deletions tests/integration/button-markup/index.html
Expand Up @@ -7,7 +7,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/requirejs.config.js"></script>
<script src="../../../js/jquery.tag.inserter.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script>
Expand All @@ -28,7 +28,7 @@
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css" />
<link rel="stylesheet" href="../../../external/qunit.css"/>

<script src="../swarminject.js"></script>
<script src="../../swarminject.js"></script>
</head>
<body>

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/checkboxradio/index.html
Expand Up @@ -7,7 +7,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/requirejs.config.js"></script>
<script src="../../../js/jquery.tag.inserter.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script>
Expand All @@ -26,7 +26,7 @@
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
<link rel="stylesheet" href="../../../external/qunit.css"/>

<script src="../swarminject.js"></script>
<script src="../../swarminject.js"></script>
</head>
<body>

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/collapsible/index.html
Expand Up @@ -8,7 +8,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/requirejs.config.js"></script>
<script src="../../../js/jquery.tag.inserter.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script>
Expand All @@ -27,7 +27,7 @@
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css" />
<link rel="stylesheet" href="../../../external/qunit.css"/>

<script src="../swarminject.js"></script>
<script src="../../swarminject.js"></script>
</head>
<body>

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/core/index.html
Expand Up @@ -8,7 +8,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/requirejs.config.js"></script>
<script src="../../../js/jquery.tag.inserter.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script>
Expand All @@ -21,7 +21,7 @@
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css" />
<link rel="stylesheet" href="../../../external/qunit.css"/>

<script src="../swarminject.js"></script>
<script src="../../swarminject.js"></script>
</head>
<body>

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/degrade-inputs/index.html
Expand Up @@ -8,7 +8,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/requirejs.config.js"></script>
<script src="../../../js/jquery.tag.inserter.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script>
Expand All @@ -21,7 +21,7 @@

<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
<link rel="stylesheet" href="../../../external/qunit.css"/>
<script src="../swarminject.js"></script>
<script src="../../swarminject.js"></script>
</head>
<body>

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/dialog/index.html
Expand Up @@ -13,7 +13,7 @@
$.mobile.page.prototype.options.contentTheme = "d";
});
</script>
<script src="../../unit/jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script>
Expand All @@ -34,7 +34,7 @@
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
<link rel="stylesheet" href="../../../external/qunit.css"/>

<script src="../../unit/swarminject.js"></script>
<script src="../../../swarminject.js"></script>
</head>
<body>

Expand Down
6 changes: 3 additions & 3 deletions tests/integration/dialog/no-hash-tests.html
Expand Up @@ -14,7 +14,7 @@
$.mobile.pushStateEnabled = false;
});
</script>
<script src="../../unit/jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script>
Expand All @@ -35,7 +35,7 @@
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
<link rel="stylesheet" href="../../../external/qunit.css"/>

<script src="../../unit/swarminject.js"></script>
<script src="../../../swarminject.js"></script>
</head>
<body>

Expand All @@ -47,7 +47,7 @@ <h2 id="qunit-userAgent"></h2>

<div id="mypage" data-nstest-role="page" data-nstest-theme="a">
<div data-nstest-role="content">
<a id="dialog-no-hash-link" href="../../unit/dialog/dialog-no-hash.html" data-role="dialog">Dialog</a>
<a id="dialog-no-hash-link" href="dialog-no-hash.html" data-role="dialog">Dialog</a>
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/fixed-toolbar/index.html
Expand Up @@ -8,7 +8,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/requirejs.config.js"></script>
<script src="../../../js/jquery.tag.inserter.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script>
Expand All @@ -25,7 +25,7 @@
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
<link rel="stylesheet" href="../../../external/qunit.css"/>

<script src="../swarminject.js"></script>
<script src="../../swarminject.js"></script>
</head>
<body>

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/listview/index.html
Expand Up @@ -8,7 +8,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/requirejs.config.js"></script>
<script src="../../../js/jquery.tag.inserter.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script type="text/javascript">
Expand All @@ -34,7 +34,7 @@
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css" />
<link rel="stylesheet" href="../../../external/qunit.css"/>

<script src="../swarminject.js"></script>
<script src="../../swarminject.js"></script>
</head>
<body>

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/listview/nested-tests.html
Expand Up @@ -8,7 +8,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/requirejs.config.js"></script>
<script src="../../../js/jquery.tag.inserter.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script type="text/javascript">
Expand All @@ -33,7 +33,7 @@
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css" />
<link rel="stylesheet" href="../../../external/qunit.css"/>

<script src="../swarminject.js"></script>
<script src="../../swarminject.js"></script>
</head>
<body>

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/listview/push-state-disabled-tests.html
Expand Up @@ -2,8 +2,8 @@
<html lang="en">
<head>
<!-- forces the base-tests into a push state disabled run and allows for
the test suite runner to pick it up as a seperate test set. See test/unit/ls.php,
test/unit/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
<script src="../../../js/jquery.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script type="text/javascript">
Expand Down
Expand Up @@ -18,7 +18,7 @@

</script>
<script src="../../../../../js/jquery.tag.inserter.js"></script>
<script src="../../../jquery.setNameSpace.js"></script>
<script src="../../../../jquery.setNameSpace.js"></script>
<script src="../../../../../tests/jquery.testHelper.js"></script>
<script src="../../../../../js/"></script>

Expand All @@ -31,7 +31,7 @@
</script>

<script type="text/javascript" src="../../navigation_base.js"></script>
<script src="../swarminject.js"></script>
<script src="../../swarminject.js"></script>
</head>
<body>

Expand Down
File renamed without changes.
Expand Up @@ -16,7 +16,7 @@
[ "event_beforenavigate.js" ]
], "../../../../js" );
</script>
<script src="../../swarminject.js"></script>
<script src="../../../swarminject.js"></script>
</head>
<body>
<div id="qunit"></div>
Expand Down
Expand Up @@ -16,7 +16,7 @@
[ "event_core.js" ]
], "../../../../js" );
</script>
<script src="../../swarminject.js"></script>
<script src="../../../swarminject.js"></script>
</head>
<body>
<div id="qunit"></div>
Expand Down
Expand Up @@ -2,8 +2,8 @@
<html lang="en">
<head>
<!-- forces the base-tests into a push state disabled run and allows for
the test suite runner to pick it up as a seperate test set. See test/unit/ls.php,
test/unit/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
<script src="../../../../js/jquery.js"></script>
<script src="../../../jquery.testHelper.js"></script>
<script type="text/javascript">
Expand Down
File renamed without changes.
Expand Up @@ -6,7 +6,7 @@
<title>jQuery Mobile Navigation Test Suite</title>

<script src="../../../js/jquery.tag.inserter.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script type="text/javascript">
$( document ).bind( "mobileinit", function(){
Expand All @@ -23,7 +23,7 @@
<script src="../../../external/qunit.js"></script>
<script type="text/javascript" src="navigation_core.js"></script>
<script type="text/javascript" src="navigation_paths.js"></script>
<script src="../swarminject.js"></script>
<script src="../../swarminject.js"></script>
</head>
<body>
<div id="qunit"></div>
Expand Down Expand Up @@ -215,17 +215,17 @@ <h1>Dialog</h1>
<a href="path-tests/file.html" id="doc-rel-test-two">go</a>
<a href="path-tests/sub-dir/file.html" id="doc-rel-test-three">go</a>
<a href="path-tests/sub-dir/" id="doc-rel-test-four">go</a>
<a href="../../unit/navigation/path-tests/parent-ref.html" id="doc-rel-test-five">go</a>
<a href="../../unit/navigation/path-tests/parent/" id="doc-rel-test-six">go</a>
<a href="../../integration/navigation/path-tests/parent-ref.html" id="doc-rel-test-five">go</a>
<a href="../../integration/navigation/path-tests/parent/" id="doc-rel-test-six">go</a>

<!-- site rel links -->
<!-- these will be altered before the test suite runs to use the current path -->
<a href="file.html" id="site-rel-test-one" class="site-rel">go</a>
<a href="path-tests/file.html" id="site-rel-test-two" class="site-rel">go</a>
<a href="path-tests/sub-dir/file.html" id="site-rel-test-three" class="site-rel">go</a>
<a href="path-tests/sub-dir/" id="site-rel-test-four" class="site-rel">go</a>
<a href="../../unit/navigation/path-tests/parent-ref.html" id="site-rel-test-five" class="site-rel">go</a>
<a href="../../unit/navigation/path-tests/parent/" id="site-rel-test-six" class="site-rel">go</a>
<a href="../../integration/navigation/path-tests/parent-ref.html" id="site-rel-test-five" class="site-rel">go</a>
<a href="../../integration/navigation/path-tests/parent/" id="site-rel-test-six" class="site-rel">go</a>

<!-- protocol rel links -->
<!-- these will be altered before the test suite runs to use the
Expand All @@ -234,8 +234,8 @@ <h1>Dialog</h1>
<a href="path-tests/file.html" id="protocol-rel-test-two" class="protocol-rel">go</a>
<a href="path-tests/sub-dir/file.html" id="protocol-rel-test-three" class="protocol-rel">go</a>
<a href="path-tests/sub-dir/" id="protocol-rel-test-four" class="protocol-rel">go</a>
<a href="../../unit/navigation/path-tests/parent-ref.html" id="protocol-rel-test-five" class="protocol-rel">go</a>
<a href="../../unit/navigation/path-tests/parent/" id="protocol-rel-test-six" class="protocol-rel">go</a>
<a href="../../integration/navigation/path-tests/parent-ref.html" id="protocol-rel-test-five" class="protocol-rel">go</a>
<a href="../../integration/navigation/path-tests/parent/" id="protocol-rel-test-six" class="protocol-rel">go</a>

<!-- absolute links -->
<!-- these will be altered before the test suite runs to use the
Expand All @@ -244,8 +244,8 @@ <h1>Dialog</h1>
<a href="path-tests/file.html" id="absolute-test-two" class="absolute">go</a>
<a href="path-tests/sub-dir/file.html" id="absolute-test-three" class="absolute">go</a>
<a href="path-tests/sub-dir/" id="absolute-test-four" class="absolute">go</a>
<a href="../../unit/navigation/path-tests/parent-ref.html" id="absolute-test-five" class="absolute">go</a>
<a href="../../unit/navigation/path-tests/parent/" id="absolute-test-six" class="absolute">go</a>
<a href="../../integration/navigation/path-tests/parent-ref.html" id="absolute-test-five" class="absolute">go</a>
<a href="../../integration/navigation/path-tests/parent/" id="absolute-test-six" class="absolute">go</a>

</div>

Expand Down
Expand Up @@ -2,8 +2,8 @@
<html lang="en">
<head>
<!-- forces the base-tests into a push state disabled run and allows for
the test suite runner to pick it up as a seperate test set. See test/unit/ls.php,
test/unit/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
<script src="../../../js/jquery.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script type="text/javascript">
Expand Down
Expand Up @@ -6,7 +6,7 @@
<title>jQuery Mobile Navigation Test Suite</title>

<script src="../../../../js/jquery.tag.inserter.js"></script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../../jquery.setNameSpace.js"></script>
<script src="../../../../tests/jquery.testHelper.js"></script>
<script type="text/javascript">
$( window ).bind( "mobileinit", function(){
Expand All @@ -17,7 +17,7 @@
<link rel="stylesheet" href="../../../../css/themes/default/jquery.mobile.css"/>
<link rel="stylesheet" href="../../../../external/qunit.css"/>
<script src="../../../../external/qunit.js"></script>
<script src="../../swarminject.js"></script>
<script src="../../../swarminject.js"></script>
<script type="text/javascript" src="navigation_query_param_hash.js"></script>
</head>
<body>
Expand Down
Expand Up @@ -16,7 +16,7 @@
[ "method_core.js" ]
], "../../../../js" );
</script>
<script src="../../swarminject.js"></script>
<script src="../../../swarminject.js"></script>
</head>
<body>
<div id="qunit"></div>
Expand Down
Expand Up @@ -2,8 +2,8 @@
<html lang="en">
<head>
<!-- forces the base-tests into a push state disabled run and allows for
the test suite runner to pick it up as a seperate test set. See test/unit/ls.php,
test/unit/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
<script src="../../../../js/jquery.js"></script>
<script src="../../../jquery.testHelper.js"></script>
<script type="text/javascript">
Expand Down
Expand Up @@ -13,7 +13,7 @@
$.mobile.page.prototype.options.contentTheme = "d";
});
</script>
<script src="../../jquery.setNameSpace.js"></script>
<script src="../../../jquery.setNameSpace.js"></script>
<script src="../../../jquery.testHelper.js"></script>
<script src="../../../../external/qunit.js"></script>
<script>
Expand All @@ -32,7 +32,7 @@

<link rel="stylesheet" href="../../../../css/themes/default/jquery.mobile.css"/>
<link rel="stylesheet" href="../../../../external/qunit.css"/>
<script src="../../swarminject.js"></script>
<script src="../../../swarminject.js"></script>
</head>
<body>

Expand Down
Expand Up @@ -41,7 +41,7 @@ $.testHelper.delayStart();
function(){
ok( $.mobile.activePage[0] === $( "#active-state-page1" )[ 0 ], "successful navigation to internal page." );

$.testHelper.openPage("#/tests/unit/navigation/external.html");
$.testHelper.openPage("#/tests/integration/navigation/external.html");
},

function() {
Expand Down
Expand Up @@ -2,8 +2,8 @@
<html lang="en">
<head>
<!-- forces the base-tests into a push state disabled run and allows for
the test suite runner to pick it up as a seperate test set. See test/unit/ls.php,
test/unit/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
<script src="../../../js/jquery.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script type="text/javascript">
Expand Down

0 comments on commit b4460e1

Please sign in to comment.