Merge pull request #364 from jakerella/jquery-4.0.0-beta.2

Support for jquery 4.0.0-beta

Author: jakerella

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2024-09-09 v2.7.0-beta.0
+    * Support for jQuery 4.0.0-beta
+    * Removed deprecated calls to $.isArray() and $.isFunction()
+    * Updated cross-origin tests to use a safe domain
+    * Thanks to @jayaddison for the nudge and PR!
+
 ## 2024-02-17 v2.6.1
     * Changed license from dual (MIT & GPL) to only be MIT
     * Updated authorship to myself (creator of all v2 changes) and moved JD Sharp to contributor

CONTRIBUTING.md

@@ -155,7 +155,7 @@ Currently, @jakerella is the only one doing so.
 1. Update the `CHANGELOG.md`, `package.json` version, and any other necessary files.
 (Note that these can be in a commit, but put them in that new branch.)
 1. Make sure to generate fresh dist files if necessary and commit those.
-1. Submit a PR for the branch, this will initiate the Travis CI checks.
+1. Submit a PR for the branch, fill out all of the necessary details.
 1. Ask others for input on the PR (mostly testing in their own browsers).
 1. *If all is well*, merge the branch into `master`
 1. Create a release on Github with a tag matching the version number and proper info.

dist/jquery.mockjax.js

@@ -1,7 +1,7 @@
 /*! jQuery Mockjax
  * A Plugin providing simple and flexible mocking of ajax requests and responses
  * 
- * Version: 2.6.0
+ * Version: 2.7.0-beta.0
  * Home: https://github.com/jakerella/jquery-mockjax
  * Copyright (c) 2024 Jordan Kasper, formerly appendTo;
  * NOTE: This repository was taken over by Jordan Kasper (@jakerella) October, 2014
@@ -78,14 +78,14 @@
 		logger.debug( mock, ['Checking mock data against request data', mock, live] );
 		var identical = true;
 
-		if ( $.isFunction(mock) ) {
+		if (typeof mock === 'function') {
 			return !!mock(live);
 		}
 
 		// Test for situations where the data is a querystring (not an object)
 		if (typeof live === 'string') {
 			// Querystring may be a regex
-			if ($.isFunction( mock.test )) {
+			if (typeof mock.test === 'function') {
 				return mock.test(live);
 			} else if (typeof mock === 'object') {
 				live = getQueryParams(live);
@@ -100,12 +100,12 @@
 				return identical;
 			} else {
 				if ( typeof live[k] === 'object' && live[k] !== null ) {
-					if ( identical && $.isArray( live[k] ) ) {
-						identical = $.isArray( mock[k] ) && live[k].length === mock[k].length;
+					if ( identical && Array.isArray( live[k] ) ) {
+						identical = Array.isArray( mock[k] ) && live[k].length === mock[k].length;
 					}
 					identical = identical && isMockDataEqual(mock[k], live[k]);
 				} else {
-					if ( mock[k] && $.isFunction( mock[k].test ) ) {
+					if ( mock[k] && typeof mock[k].test === 'function') {
 						identical = identical && mock[k].test(live[k]);
 					} else {
 						identical = identical && ( mock[k] === live[k] );
@@ -160,7 +160,7 @@
 	function getMockForRequest( handler, requestSettings ) {
 		// If the mock was registered with a function, let the function decide if we
 		// want to mock this request
-		if ( $.isFunction(handler) ) {
+		if (typeof handler === 'function') {
 			return handler( requestSettings );
 		}
 
@@ -169,7 +169,7 @@
 
 		// Inspect the URL of the request and check if the mock handler's url
 		// matches the url for this ajax request
-		if ( $.isFunction(handler.url.test) ) {
+		if (typeof handler.url.test === 'function') {
 			// namespace exists prepend handler.url with namespace
 			if (!!namespace) {
 				namespace = namespace.replace(/(\/+)$/, '');
@@ -243,7 +243,7 @@
 	}
 
 	function parseResponseTimeOpt(responseTime) {
-		if ($.isArray(responseTime) && responseTime.length === 2) {
+		if (Array.isArray(responseTime) && responseTime.length === 2) {
 			var min = responseTime[0];
 			var max = responseTime[1];
 			if(isPosNum(min) && isPosNum(max)) {
@@ -292,7 +292,7 @@
 							this.responseText = mockHandler.responseText;
 						}
 
-						if ($.isArray(mockHandler.status)) {
+						if (Array.isArray(mockHandler.status)) {
 							var idxStatus = Math.floor(Math.random() * mockHandler.status.length);
 							this.status = mockHandler.status[idxStatus];
 						} else if (typeof mockHandler.status === 'number' || typeof mockHandler.status === 'string') {
@@ -306,7 +306,7 @@
 						onReady = this.onload || this.onreadystatechange;
 
 						// jQuery < 1.4 doesn't have onreadystate change for xhr
-						if ( $.isFunction( onReady ) ) {
+						if (typeof onReady === 'function') {
 							if( mockHandler.isTimeout) {
 								this.status = -1;
 							}
@@ -319,7 +319,7 @@
 
 					// We have an executable function, call it to give
 					// the mock handler a chance to update it's data
-					if ( $.isFunction(mockHandler.response) ) {
+					if (typeof mockHandler.response === 'function') {
 						// Wait for it to finish
 						if ( mockHandler.response.length === 2 ) {
 							mockHandler.response(origSettings, function () {
@@ -495,7 +495,7 @@
 			newMock = ($.Deferred) ? (new $.Deferred()) : null;
 
 		// If the response handler on the moock is a function, call it
-		if ( mockHandler.response && $.isFunction(mockHandler.response) ) {
+		if ( mockHandler.response && typeof mockHandler.response === 'function' ) {
 
 			mockHandler.response(origSettings);
 
@@ -545,7 +545,7 @@
 
 			if ( newMock ) {
 				try {
-					json = $.parseJSON( mockHandler.responseText );
+					json = JSON.parse( mockHandler.responseText );
 				} catch (err) { /* just checking... */ }
 
 				newMock.resolveWith( callbackContext, [json || mockHandler.responseText] );
@@ -641,7 +641,7 @@
 		overrideCallback = function(action, mockHandler) {
 			var origHandler = origSettings[action.toLowerCase()];
 			return function() {
-				if ( $.isFunction(origHandler) ) {
+				if (typeof origHandler === 'function') {
 					origHandler.apply(this, [].slice.call(arguments));
 				}
 				mockHandler['onAfter' + action]();
@@ -725,13 +725,13 @@
 			}
 
 			// Set up onAfter[X] callback functions
-			if ( $.isFunction( mockHandler.onAfterSuccess ) ) {
+			if (typeof mockHandler.onAfterSuccess === 'function') {
 				origSettings.success = overrideCallback('Success', mockHandler);
 			}
-			if ( $.isFunction( mockHandler.onAfterError ) ) {
+			if (typeof mockHandler.onAfterError === 'function') {
 				origSettings.error = overrideCallback('Error', mockHandler);
 			}
-			if ( $.isFunction( mockHandler.onAfterComplete ) ) {
+			if (typeof mockHandler.onAfterComplete === 'function') {
 				origSettings.complete = overrideCallback('Complete', mockHandler);
 			}
 
@@ -935,7 +935,7 @@
 	 */
 	$.mockjax = function(settings) {
 		// Multiple mocks.
-		if ( $.isArray(settings) ) {
+		if (Array.isArray(settings)) {
 			return $.map(settings, function(s) {
 				return $.mockjax(s);
 			});

dist/jquery.mockjax.min.js

@@ -64,7 +64,8 @@ module.exports = {
             jQueryVersions: [
                 '1.12.4',
                 '2.2.4',
-                '3.7.1'
+                '3.7.1',
+                '4.0.0-beta.2'
             ]
         },
         edge: {
@@ -75,7 +76,8 @@ module.exports = {
             jQueryVersions: [
                 '1.12.4',
                 '2.2.4',
-                '3.7.1'
+                '3.7.1',
+                '4.0.0-beta.2'
             ]
         },
         browserify: {