Skip to content

Commit 7c896dd

Browse files
committed
Tests: Change test infrastructure to use AMD and reduce boilerplate
Ref #10119 Ref gh-1528 * Adds RequireJS and relies on AMD for loading dependencies. * Updates to grunt-contrib-qunit 0.6.0. * Convert `domEqual()` to a proper QUnit assertion. * Introduces two bootstrap files (JS and CSS) which use `data-` attributes to reduce the amount of boilerplate needed in each test
1 parent d0ea32e commit 7c896dd

File tree

11 files changed

+2584
-1
lines changed

11 files changed

+2584
-1
lines changed

Gruntfile.js

+3
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ grunt.initConfig({
225225
return !( /(all|index|test)\.html$/ ).test( file );
226226
}),
227227
options: {
228+
inject: false,
228229
page: {
229230
viewportSize: { width: 700, height: 500 }
230231
}
@@ -284,6 +285,8 @@ grunt.initConfig({
284285
"qunit-composite/qunit-composite.css": "qunit-composite/qunit-composite.css",
285286
"qunit-composite/LICENSE.txt": "qunit-composite/LICENSE.txt",
286287

288+
"requirejs/require.js": "requirejs/require.js",
289+
287290
"jquery-mousewheel/jquery.mousewheel.js": "jquery-mousewheel/jquery.mousewheel.js",
288291
"jquery-mousewheel/LICENSE.txt": "jquery-mousewheel/LICENSE.txt",
289292

bower.json

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"qunit": "1.18.0",
1818
"qunit-assert-classes": "0.1.5",
1919
"qunit-composite": "JamesMGreene/qunit-composite#v1.0.4",
20+
"requirejs": "2.1.14",
2021

2122
"jquery-1.7.0": "jquery#1.7.0",
2223
"jquery-1.7.1": "jquery#1.7.1",

0 commit comments

Comments
 (0)