diff options
Diffstat (limited to 'tests/unit/progressbar')
| -rw-r--r-- | tests/unit/progressbar/all.html | 4 | ||||
| -rw-r--r-- | tests/unit/progressbar/progressbar.html | 14 | ||||
| -rw-r--r-- | tests/unit/progressbar/progressbar_common.js (renamed from tests/unit/progressbar/progressbar_defaults.js) | 0 |
3 files changed, 8 insertions, 10 deletions
diff --git a/tests/unit/progressbar/all.html b/tests/unit/progressbar/all.html index eefb9c135..16b9e0ace 100644 --- a/tests/unit/progressbar/all.html +++ b/tests/unit/progressbar/all.html @@ -7,9 +7,9 @@ <script src="../../../jquery-1.7.2.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> - <link rel="stylesheet" href="../subsuiteRunner.css"> + <link rel="stylesheet" href="../qunit-composite.css"> <script src="../../../external/qunit.js"></script> - <script src="../subsuiteRunner.js"></script> + <script src="../qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html index 8b55f5a89..70a4abe56 100644 --- a/tests/unit/progressbar/progressbar.html +++ b/tests/unit/progressbar/progressbar.html @@ -5,9 +5,12 @@ <title>jQuery UI Progressbar Test Suite</title> <script src="../../jquery.js"></script> - <script src="../../resource_loader.js"></script> + <link rel="stylesheet" href="../../../external/qunit.css"> + <script src="../../../external/qunit.js"></script> + <script src="../../jquery.simulate.js"></script> + <script src="../testsuite.js"></script> <script> - loadResources({ + TestHelpers.loadResources({ css: [ "ui.core", "ui.progressbar" ], js: [ "ui/jquery.ui.core.js", @@ -17,13 +20,8 @@ }); </script> - <link rel="stylesheet" href="../../../external/qunit.css"> - <script src="../../../external/qunit.js"></script> - <script src="../../jquery.simulate.js"></script> - <script src="../testsuite.js"></script> - + <script src="progressbar_common.js"></script> <script src="progressbar_core.js"></script> - <script src="progressbar_defaults.js"></script> <script src="progressbar_events.js"></script> <script src="progressbar_methods.js"></script> <script src="progressbar_options.js"></script> diff --git a/tests/unit/progressbar/progressbar_defaults.js b/tests/unit/progressbar/progressbar_common.js index 2f97a78bb..2f97a78bb 100644 --- a/tests/unit/progressbar/progressbar_defaults.js +++ b/tests/unit/progressbar/progressbar_common.js |