Skip to content

Tests: Replace resource loader with AMD #1511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
Closed

Tests: Replace resource loader with AMD #1511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8b3d752
Tests: Replace resource loader with AMD
rxaviers Dec 12, 2013
3cdac75
Tests: Use a data attribute for stylesheets
scottgonzalez Mar 18, 2015
9e9bef0
[fixup]: Reorganize a bunch of stuff
scottgonzalez Mar 20, 2015
9202eac
[fixup]: domEqual is a real assertion
scottgonzalez Mar 20, 2015
fc5150b
[fixup]: cleanup
scottgonzalez Mar 23, 2015
f109189
[fixup]: Move remaining helpers to lib
scottgonzalez Mar 23, 2015
6170cb5
[fixup]: Add define to globals in .jshintrc
scottgonzalez Mar 23, 2015
558ebdc
[fixup]: AMD in phantom
scottgonzalez Mar 30, 2015
eddd999
[fixup]: rename common tests
scottgonzalez Mar 31, 2015
e79f763
[fixup]: domEqual context
scottgonzalez Mar 31, 2015
fb95089
[fixup]: Upgrade grunt-contrib-qunit
scottgonzalez Mar 31, 2015
1870ea4
[fixup]: domEqual 899d90709a141ce22fedab2cfdf6044d9928f831
scottgonzalez Mar 31, 2015
32ee1fd
[fixup]: Update QUnit
scottgonzalez Mar 31, 2015
b4ccef0
[fixup]: closeEnough() -> assert.close()
scottgonzalez Mar 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ grunt.initConfig({
}
},
qunit: {
// TODO: should disable injecting the bridge
// Tests run fine, but there is an unhandled error when the injection occurs
files: expandFiles( "tests/unit/" + component + "/*.html" ).filter(function( file ) {
return !( /(all|index|test)\.html$/ ).test( file );
}),
Expand Down Expand Up @@ -280,6 +282,8 @@ grunt.initConfig({
"qunit-assert-classes/qunit-assert-classes.js": "qunit-assert-classes/qunit-assert-classes.js",
"qunit-assert-classes/LICENSE.txt": "qunit-assert-classes/LICENSE",

"requirejs/require.js": "requirejs/require.js",

"jquery-mousewheel/jquery.mousewheel.js": "jquery-mousewheel/jquery.mousewheel.js",
"jquery-mousewheel/LICENSE.txt": "jquery-mousewheel/LICENSE.txt",

Expand Down
1 change: 1 addition & 0 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"jshint": "2.4.4",
"qunit": "1.17.1",
"qunit-assert-classes": "0.1.5",
"requirejs": "2.1.14",

"jquery-1.7.0": "jquery#1.7.0",
"jquery-1.7.1": "jquery#1.7.1",
Expand Down
16 changes: 13 additions & 3 deletions external/qunit/qunit.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*!
* QUnit 1.17.1
* QUnit 1.17.2-pre
* http://qunitjs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2015-01-20T19:39Z
* Date: 2015-03-31T19:26Z
*/

/** Font Family and Sizes */
Expand Down Expand Up @@ -116,7 +116,12 @@

#qunit-tests.hidepass li.running,
#qunit-tests.hidepass li.pass {
display: none;
visibility: hidden;
width: 0px;
height: 0px;
padding: 0;
border: 0;
margin: 0;
}

#qunit-tests li strong {
Expand All @@ -132,6 +137,11 @@
color: #C2CCD1;
text-decoration: none;
}

#qunit-tests li p a {
padding: 0.25em;
color: #6B6464;
}
#qunit-tests li a:hover,
#qunit-tests li a:focus {
color: #000;
Expand Down
Loading