Skip to content

Commit 665239a

Browse files
committed
Tests: Move qunit-composite to tests/lib so that we can modify it
1 parent 300a800 commit 665239a

File tree

30 files changed

+50
-55
lines changed

30 files changed

+50
-55
lines changed

Gruntfile.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,6 @@ grunt.initConfig( {
280280
"qunit-assert-close/qunit-assert-close.js",
281281
"qunit-assert-close/MIT-LICENSE.txt": "qunit-assert-close/MIT-LICENSE.txt",
282282

283-
"qunit-composite/qunit-composite.js": "qunit-composite/qunit-composite.js",
284-
"qunit-composite/qunit-composite.css": "qunit-composite/qunit-composite.css",
285-
"qunit-composite/LICENSE.txt": "qunit-composite/LICENSE.txt",
286-
287283
"requirejs/require.js": "requirejs/require.js",
288284

289285
"jquery-mousewheel/jquery.mousewheel.js": "jquery-mousewheel/jquery.mousewheel.js",

bower.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"qunit": "2.19.4",
1919
"qunit-assert-classes": "1.0.2",
2020
"qunit-assert-close": "JamesMGreene/qunit-assert-close#v2.1.2",
21-
"qunit-composite": "JamesMGreene/qunit-composite#v2.0.0",
2221
"requirejs": "2.1.14",
2322

2423
"jquery-1.8.0": "jquery#1.8.0",

tests/unit/accordion/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../external/qunit/qunit.js"></script>
12-
<script src="../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313

1414
<script>
1515
(function() {

tests/unit/autocomplete/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/button/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/checkboxradio/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/controlgroup/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/core/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/datepicker/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/dialog/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/draggable/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/droppable/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/effects/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/form-reset-mixin/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/menu/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/position/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/progressbar/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/resizable/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/selectable/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/selectmenu/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/slider/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/sortable/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/spinner/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/tabs/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/tooltip/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

tests/unit/widget/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../external/jquery/jquery.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
10-
<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
10+
<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
1111
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/qunit-composite/qunit-composite.js"></script>
12+
<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

0 commit comments

Comments
 (0)