From 98b539171b6e805fa79346a5e9896865e5213b9c Mon Sep 17 00:00:00 2001
From: Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
Date: Sun, 8 Dec 2019 22:23:08 +0100
Subject: All: Migrate away from deprecated/removed Core APIs

Summary of the changes:

* Build: Add jQuery 3.2.0-3.4.1 to versions UI can be tested against
* Build: Load jQuery & Migrate via HTTPS
* Build: Add package-lock.json to .gitignore
* Build: Update jQuery Migrate from 3.0.0 to 3.1.0
* Build: Allow to run tests against jQuery 3.x-git
* Build: Fix formatting according to JSCS rules
* Build: Disable JSCS for the inlined jQuery Color
* All: Switch from $.isArray to Array.isArray (jQuery.isArray will be
  removed in jQuery 4.0)
* All: Switch from `$.isFunction( x )` to `typeof x === "function"`
  (jQuery.isFunction will be removed in jQuery 4.0)
* All: Inline jQuery.isWindow as it'll be removed in jQuery 4.0
* Effects: Fix a timing issue in a variable declaration. Previously,
  a jQuery object was created, chained & assigned to a variable that
  was then accessed in a callback used inside of this chained
  definition. Due to a timing difference in when the callback fired for
  the first time in latest jQuery master, it was being called before
  the variable was defined.
* Tests: Make dialog & draggable unit tests less strict (newest jQuery
  returns fractional results in some cases, making comparisons fail when
  there's a tiny difference)
* All: Migrate from $.trim to bare String.prototype.trim (jQuery.trim
  will be deprecated in jQuery 3.5)

Closes gh-1901
---
 tests/lib/bootstrap.js | 8 ++++----
 tests/lib/common.js    | 4 ++--
 tests/lib/qunit.js     | 3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'tests/lib')

diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js
index 487b3b807..27c1b610f 100644
--- a/tests/lib/bootstrap.js
+++ b/tests/lib/bootstrap.js
@@ -104,8 +104,8 @@ function jqueryUrl() {
 	var version = parseUrl().jquery || DEFAULT_JQUERY_VERSION;
 	var url;
 
-	if ( version === "git" ) {
-		url = "http://code.jquery.com/jquery-" + version;
+	if ( version === "git" || version === "3.x-git" ) {
+		url = "https://code.jquery.com/jquery-" + version;
 	} else {
 		url = "../../../external/jquery-" + version + "/jquery";
 	}
@@ -118,9 +118,9 @@ function migrateUrl() {
 	var url;
 
 	if ( jqueryVersion === "git" ) {
-		url = "http://code.jquery.com/jquery-migrate-git";
+		url = "https://code.jquery.com/jquery-migrate-git";
 	} else if ( jqueryVersion[ 0 ] === "3" ) {
-		url = "../../../external/jquery-migrate-3.0.0/jquery-migrate";
+		url = "../../../external/jquery-migrate-3.1.0/jquery-migrate";
 	} else if ( jqueryVersion[ 0 ] === "1" || jqueryVersion[ 0 ] === "2" ) {
 		url = "../../../external/jquery-migrate-1.4.1/jquery-migrate";
 	} else if ( jqueryVersion === "custom" ) {
diff --git a/tests/lib/common.js b/tests/lib/common.js
index 57b7768cf..7d3b3db2a 100644
--- a/tests/lib/common.js
+++ b/tests/lib/common.js
@@ -13,8 +13,8 @@ function testWidgetDefaults( widget, defaults ) {
 		var count = 0;
 		$.each( defaults, function( key, val ) {
 			assert.expect( ++count );
-			if ( $.isFunction( val ) ) {
-				assert.ok( $.isFunction( pluginDefaults[ key ] ), key );
+			if ( typeof val === "function" ) {
+				assert.ok( typeof pluginDefaults[ key ] === "function", key );
 				return;
 			}
 			assert.deepEqual( pluginDefaults[ key ], val, key );
diff --git a/tests/lib/qunit.js b/tests/lib/qunit.js
index c16d31154..4c5ec3812 100644
--- a/tests/lib/qunit.js
+++ b/tests/lib/qunit.js
@@ -31,6 +31,9 @@ QUnit.config.urlConfig.push( {
 		"2.2.0", "2.2.1", "2.2.2", "2.2.3", "2.2.4",
 		"3.0.0",
 		"3.1.0", "3.1.1",
+		"3.2.0", "3.2.1",
+		"3.3.0", "3.3.1",
+		"3.4.0", "3.4.1",
 		"git", "custom"
 	],
 	tooltip: "Which jQuery Core version to test against"
-- 
cgit v1.2.3