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.

Closes gh-1646
This commit is contained in:
Michał Gołębiowski 2015-11-12 15:30:23 +01:00 committed by Scott González
parent cd7f8f02cf
commit 15586ea752
4 changed files with 12 additions and 5 deletions

View File

@ -3,7 +3,7 @@ module.exports = function( grunt ) {
"use strict"; "use strict";
var versions = { var versions = {
"compat-git": "compat-git", "git": "git",
"1.11": "1.11.0 1.11.1 1.11.2 1.11.3", "1.11": "1.11.0 1.11.1 1.11.2 1.11.3",
"1.10": "1.10.0 1.10.2", "1.10": "1.10.0 1.10.2",
"1.9": "1.9.0 1.9.1", "1.9": "1.9.0 1.9.1",
@ -38,9 +38,16 @@ function submit( commit, runs, configFile, extra, done ) {
var testName, var testName,
testswarm = require( "testswarm" ), testswarm = require( "testswarm" ),
config = grunt.file.readJSON( configFile ).jqueryui, config = grunt.file.readJSON( configFile ).jqueryui,
browserSets = config.browserSets,
commitUrl = "https://github.com/jquery/jquery-ui/commit/" + commit; commitUrl = "https://github.com/jquery/jquery-ui/commit/" + commit;
if ( extra ) { if ( extra ) {
// jquery-git doesn't support IE 8.
if ( extra === "core git" ) {
browserSets = "jquery-ui-future";
}
extra = " (" + extra + ")"; extra = " (" + extra + ")";
} }
@ -60,7 +67,7 @@ function submit( commit, runs, configFile, extra, done ) {
name: "Commit <a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra, name: "Commit <a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra,
runs: runs, runs: runs,
runMax: config.runMax, runMax: config.runMax,
browserSets: config.browserSets, browserSets: browserSets,
timeout: 1000 * 60 * 30 timeout: 1000 * 60 * 30
}, function( error, passed ) { }, function( error, passed ) {
if ( error ) { if ( error ) {

View File

@ -93,7 +93,7 @@ function jqueryUrl() {
var version = parseUrl().jquery; var version = parseUrl().jquery;
var url; var url;
if ( version === "git" || version === "compat-git" ) { if ( version === "git" ) {
url = "http://code.jquery.com/jquery-" + version; url = "http://code.jquery.com/jquery-" + version;
} else { } else {
url = "../../../external/jquery-" + ( version || "1.11.3" ) + "/jquery"; url = "../../../external/jquery-" + ( version || "1.11.3" ) + "/jquery";

View File

@ -27,7 +27,7 @@ QUnit.config.urlConfig.push( {
"1.11.0", "1.11.1", "1.11.2", "1.11.3", "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.0.0", "2.0.1", "2.0.2", "2.0.3",
"2.1.0", "2.1.1", "2.1.2", "2.1.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" tooltip: "Which jQuery Core version to test against"
} ); } );

View File

@ -6,7 +6,7 @@ var versions = [
"1.9.0", "1.9.1", "1.9.0", "1.9.1",
"1.10.0", "1.10.1", "1.10.2", "1.10.0", "1.10.1", "1.10.2",
"1.11.0", "1.11.1", "1.11.2", "1.11.3", "1.11.0", "1.11.1", "1.11.2", "1.11.3",
"compat-git" "git"
], ],
additionalTests = { additionalTests = {