]> source.dussan.org Git - jquery-ui.git/commitdiff
Build: Use jquery-git in place of jquery-compat-git
authorMichał Gołębiowski <m.goleb@gmail.com>
Thu, 12 Nov 2015 14:30:23 +0000 (15:30 +0100)
committerScott González <scott.gonzalez@gmail.com>
Sat, 14 Nov 2015 11:12:55 +0000 (06:12 -0500)
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

build/tasks/testswarm.js
tests/lib/bootstrap.js
tests/lib/qunit.js
tests/unit/subsuite.js

index 3aca0e7b2f3c367f70c345cf9b1e375800672693..60f2800c5583146aa273bcc49995e21366624254 100644 (file)
@@ -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 <a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra,
                        runs: runs,
                        runMax: config.runMax,
-                       browserSets: config.browserSets,
+                       browserSets: browserSets,
                        timeout: 1000 * 60 * 30
                }, function( error, passed ) {
                        if ( error ) {
index 2fe2edd1bd081f03417f6edf4c782ad7feb4ae69..4e374ac27dce732c2851c5e55951d1136b285b22 100644 (file)
@@ -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";
index b421341eacdbd67b6b6b771c0bad30256c225fe8..e2a6e85c7f4dc968e9a80470893f35d1d9d755dd 100644 (file)
@@ -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"
 } );
index 31a279c281838088a3b4b2f2a206e5d04efb4436..498f60a0ba770e6d6094c23942ca733e1b443e16 100644 (file)
@@ -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 = {