aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2015-04-06 10:56:48 -0400
committerScott González <scott.gonzalez@gmail.com>2015-04-09 09:24:45 -0400
commit9fb04e42a24263a88dc3adf1b9ce6a199309b24c (patch)
tree31df80cdc2f998385e370a586510675d09845851 /tests
parentf908a7793bf9e06f3e23d15028baf2e90e92baaa (diff)
downloadjquery-ui-9fb04e42a24263a88dc3adf1b9ce6a199309b24c.tar.gz
jquery-ui-9fb04e42a24263a88dc3adf1b9ce6a199309b24c.zip
Core: Convert tests to new infrastructure
Ref #10119 Ref gh-1528
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/core/core.html17
-rw-r--r--tests/unit/core/core.js10
-rw-r--r--tests/unit/core/selector.js7
3 files changed, 14 insertions, 20 deletions
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index f846d6e10..ae3a50370 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -4,21 +4,8 @@
<meta charset="utf-8">
<title>jQuery UI Core Test Suite</title>
- <script src="../../jquery.js"></script>
- <link rel="stylesheet" href="../../../external/qunit/qunit.css">
- <script src="../../../external/qunit/qunit.js"></script>
- <script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
- <script src="../testsuite.js"></script>
- <script>
- TestHelpers.loadResources({
- js: [ "ui/core.js" ]
- });
- </script>
-
- <script src="core.js"></script>
- <script src="selector.js"></script>
-
- <script src="../swarminject.js"></script>
+ <script src="../../lib/css.js"></script>
+ <script src="../../lib/bootstrap.js" data-modules="core selector"></script>
<style>
.zindex {
z-index: 100;
diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index a0d0a2de1..e50826e4d 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -1,8 +1,12 @@
-(function( $ ) {
+define( [
+ "jquery",
+ "lib/common",
+ "ui/core"
+], function( $, common ) {
module( "core - jQuery extensions" );
-TestHelpers.testJshint( "core" );
+common.testJshint( "core" );
test( "innerWidth - getter", function() {
expect( 2 );
@@ -134,4 +138,4 @@ test( "uniqueId / removeUniqueId", function() {
equal( el.attr( "id" ), null, "unique id has been removed from element" );
});
-})( jQuery );
+} );
diff --git a/tests/unit/core/selector.js b/tests/unit/core/selector.js
index 739eec559..39b94344b 100644
--- a/tests/unit/core/selector.js
+++ b/tests/unit/core/selector.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+ "jquery",
+ "ui/core"
+], function( $ ) {
module( "core - selectors" );
@@ -251,4 +254,4 @@ test( "tabbable - dimensionless parent with overflow", function() {
isTabbable( "#dimensionlessParent", "input" );
});
-})( jQuery );
+} );