From 08eb8445521c2792bd4940237534c60d96500979 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Scott=20Gonz=C3=A1lez?= Date: Tue, 10 Mar 2015 14:19:16 -0400 Subject: [PATCH] Tests: Use jquery-git1 instead of jquery-git Closes gh-1480 --- build/tasks/testswarm.js | 2 +- tests/jquery.js | 4 ++-- tests/unit/subsuite.js | 2 +- tests/unit/testsuite.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js index 73817abfa..bd5dbf73b 100644 --- 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 67a7ed2e6..43ba2750a 100644 --- 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 68c207db0..b0ab1f2f0 100644 --- 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 9c4d38ada..175fadd97 100644 --- 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" }); -- 2.39.5