Use grunt and bower packages as local dependencies. Close gh-1433.

This commit is contained in:
Timmy Willison
2013-11-14 10:17:18 -05:00
parent 1a13e0b1ad
commit ac7ff97f8b
12 changed files with 62 additions and 47 deletions

View File

@@ -297,8 +297,10 @@ this.loadTests = function() {
if ( dep ) {
require( [ dep ], loadDep );
} else {
// Subproject tests must be last because they replace our test fixture
testSubproject( "Sizzle", "../bower_components/sizzle/test/", /^unit\/.*\.js$/, function() {
testSubproject( "Sizzle", "../bower_modules/sizzle/test/", /^unit\/.*\.js$/, function() {
// Call load to build module filter select element
QUnit.load();

View File

@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<title>jQuery Test Suite</title>
<link rel="Stylesheet" media="screen" href="../bower_components/qunit/qunit/qunit.css" />
<link rel="Stylesheet" media="screen" href="../bower_modules/qunit/qunit.css" />
<link rel="Stylesheet" media="screen" href="data/testsuite.css" />
<!-- Includes -->
@@ -14,8 +14,8 @@
-->
<script src="data/jquery-1.9.1.js"></script>
<script src="../bower_components/qunit/qunit/qunit.js"></script>
<script src="../bower_components/requirejs/require.js"></script>
<script src="../bower_modules/qunit/qunit.js"></script>
<script src="../bower_modules/requirejs/require.js"></script>
<!-- See testinit for the list of tests -->
<script src="data/testinit.js"></script>

2
test/jquery.js vendored
View File

@@ -19,7 +19,7 @@
require.config({
baseUrl: path,
paths: {
sizzle: path + "bower_components/sizzle/dist/sizzle"
sizzle: path + "bower_modules/sizzle/dist/sizzle"
}
});
src = "src/jquery";