From 7a37fae7f79bccf41f5a8d57335e88e16a578f36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski?=
Date: Thu, 12 Nov 2015 15:30:23 +0100
Subject: [PATCH] Build: Use jquery-git in place of jquery-compat-git
jQuery Compat is not going to get released after all; jQuery UI should be tested
against jquery-git instead of jquery-compat-git.
---
build/tasks/testswarm.js | 11 +++++++++--
tests/lib/bootstrap.js | 2 +-
tests/lib/qunit.js | 2 +-
tests/unit/subsuite.js | 2 +-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index 3aca0e7b2f3..60f2800c558 100644
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -3,7 +3,7 @@ module.exports = function( grunt ) {
"use strict";
var versions = {
- "compat-git": "compat-git",
+ "git": "git",
"1.11": "1.11.0 1.11.1 1.11.2 1.11.3",
"1.10": "1.10.0 1.10.2",
"1.9": "1.9.0 1.9.1",
@@ -38,9 +38,16 @@ function submit( commit, runs, configFile, extra, done ) {
var testName,
testswarm = require( "testswarm" ),
config = grunt.file.readJSON( configFile ).jqueryui,
+ browserSets = config.browserSets,
commitUrl = "https://github.com/jquery/jquery-ui/commit/" + commit;
if ( extra ) {
+
+ // jquery-git doesn't support IE 8.
+ if ( extra === "core git" ) {
+ browserSets = "jquery-ui-future";
+ }
+
extra = " (" + extra + ")";
}
@@ -60,7 +67,7 @@ function submit( commit, runs, configFile, extra, done ) {
name: "Commit " + commit.substr( 0, 10 ) + "" + extra,
runs: runs,
runMax: config.runMax,
- browserSets: config.browserSets,
+ browserSets: browserSets,
timeout: 1000 * 60 * 30
}, function( error, passed ) {
if ( error ) {
diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js
index 2fe2edd1bd0..4e374ac27dc 100644
--- a/tests/lib/bootstrap.js
+++ b/tests/lib/bootstrap.js
@@ -93,7 +93,7 @@ function jqueryUrl() {
var version = parseUrl().jquery;
var url;
- if ( version === "git" || version === "compat-git" ) {
+ if ( version === "git" ) {
url = "http://code.jquery.com/jquery-" + version;
} else {
url = "../../../external/jquery-" + ( version || "1.11.3" ) + "/jquery";
diff --git a/tests/lib/qunit.js b/tests/lib/qunit.js
index b421341eacd..e2a6e85c7f4 100644
--- a/tests/lib/qunit.js
+++ b/tests/lib/qunit.js
@@ -27,7 +27,7 @@ QUnit.config.urlConfig.push( {
"1.11.0", "1.11.1", "1.11.2", "1.11.3",
"2.0.0", "2.0.1", "2.0.2", "2.0.3",
"2.1.0", "2.1.1", "2.1.2", "2.1.3",
- "compat-git", "git", "custom"
+ "git", "custom"
],
tooltip: "Which jQuery Core version to test against"
} );
diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js
index 31a279c2818..498f60a0ba7 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", "1.11.3",
- "compat-git"
+ "git"
],
additionalTests = {