Tests: Use jquery-git1 instead of jquery-git

Closes gh-1480

diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index 73817abfa6afede040877192904e40c74028e544..bd5dbf73ba5fa9cd96722451db7511f02eab3eb8 100644 (file)
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -3,7 +3,7 @@ module.exports = function( grunt ) {
 "use strict";
 
 var versions = {
-               "git": "git",
+               "git1": "git1",
                "1.11": "1.11.0 1.11.1 1.11.2",
                "1.10": "1.10.0 1.10.1 1.10.2",
                "1.9": "1.9.0 1.9.1",

diff --git a/tests/jquery.js b/tests/jquery.js
index 67a7ed2e608aa0df35a8ebf23d90e86b213bd2f5..43ba2750a319080b0ad1cf6cfaea5c4ed4b75021 100644 (file)
--- a/tests/jquery.js
+++ b/tests/jquery.js
@@ -13,8 +13,8 @@ for ( ; i < length; i++ ) {
        }
 }
 
-if ( version === "git" ) {
-       url = "http://code.jquery.com/jquery-git.js";
+if ( version === "git" || version === "git1" ) {
+       url = "http://code.jquery.com/jquery-" + version + ".js";
 } else {
        url = "../../../external/jquery-" + ( version || "1.11.2" ) + "/jquery.js";
 }

diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js
index 68c207db05a5632bc5d02b63489ccffd0a0fc373..b0ab1f2f05b177c09914c8b53ef5bcb5c4d7405d 100644 (file)
--- a/tests/unit/subsuite.js
+++ b/tests/unit/subsuite.js
@@ -6,7 +6,7 @@ var versions = [
                "1.9.0", "1.9.1",
                "1.10.0", "1.10.1", "1.10.2",
                "1.11.0", "1.11.1", "1.11.2",
-               "git"
+               "git1"
        ],
        additionalTests = {
                // component: [ "other_test.html" ]

diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 9c4d38ada07a0243e824a257d680e0aa78335a7d..175fadd971febef0d7f689fc35d59f88a3a7d86a 100644 (file)
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -70,7 +70,7 @@ QUnit.config.urlConfig.push({
                "1.11.0", "1.11.1", "1.11.2",
                "2.0.0", "2.0.1", "2.0.2", "2.0.3",
                "2.1.0", "2.1.1", "2.1.2", "2.1.3",
-               "git"
+               "git1", "git"
        ],
        tooltip: "Which jQuery Core version to test against"
 });