Skip to content

Commit 7a37fae

Browse files
committed
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.
1 parent cd7f8f0 commit 7a37fae

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

build/tasks/testswarm.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module.exports = function( grunt ) {
33
"use strict";
44

55
var versions = {
6-
"compat-git": "compat-git",
6+
"git": "git",
77
"1.11": "1.11.0 1.11.1 1.11.2 1.11.3",
88
"1.10": "1.10.0 1.10.2",
99
"1.9": "1.9.0 1.9.1",
@@ -38,9 +38,16 @@ function submit( commit, runs, configFile, extra, done ) {
3838
var testName,
3939
testswarm = require( "testswarm" ),
4040
config = grunt.file.readJSON( configFile ).jqueryui,
41+
browserSets = config.browserSets,
4142
commitUrl = "https://github.com/jquery/jquery-ui/commit/" + commit;
4243

4344
if ( extra ) {
45+
46+
// jquery-git doesn't support IE 8.
47+
if ( extra === "core git" ) {
48+
browserSets = "jquery-ui-future";
49+
}
50+
4451
extra = " (" + extra + ")";
4552
}
4653

@@ -60,7 +67,7 @@ function submit( commit, runs, configFile, extra, done ) {
6067
name: "Commit <a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra,
6168
runs: runs,
6269
runMax: config.runMax,
63-
browserSets: config.browserSets,
70+
browserSets: browserSets,
6471
timeout: 1000 * 60 * 30
6572
}, function( error, passed ) {
6673
if ( error ) {

tests/lib/bootstrap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function jqueryUrl() {
9393
var version = parseUrl().jquery;
9494
var url;
9595

96-
if ( version === "git" || version === "compat-git" ) {
96+
if ( version === "git" ) {
9797
url = "http://code.jquery.com/jquery-" + version;
9898
} else {
9999
url = "../../../external/jquery-" + ( version || "1.11.3" ) + "/jquery";

tests/lib/qunit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ QUnit.config.urlConfig.push( {
2727
"1.11.0", "1.11.1", "1.11.2", "1.11.3",
2828
"2.0.0", "2.0.1", "2.0.2", "2.0.3",
2929
"2.1.0", "2.1.1", "2.1.2", "2.1.3",
30-
"compat-git", "git", "custom"
30+
"git", "custom"
3131
],
3232
tooltip: "Which jQuery Core version to test against"
3333
} );

tests/unit/subsuite.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var versions = [
66
"1.9.0", "1.9.1",
77
"1.10.0", "1.10.1", "1.10.2",
88
"1.11.0", "1.11.1", "1.11.2", "1.11.3",
9-
"compat-git"
9+
"git"
1010
],
1111
additionalTests = {
1212

0 commit comments

Comments
 (0)