Merge pull request #337 from jakerella/v2.4.0

Update to v2.4.0
jakerella · Jun 17, 2018 · 6ef8655 · 6ef8655
2 parents c85c003 + 44c6bad
commit 6ef8655
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2018-06-17 v2.4.0
+    * Added support for an array of status codes in mocked response (thanks @reinrl)
+    * Updated broken Codacy badge
+    * Added jQuery 3.3.1 to test suite
+    * Switched to using Chrome headless (with puppeteer) for all tests
+    * No longer testing in Opera, and added Edge to the browser test list
+
 ## 2018-01-07 v2.3.0
     * Added new `handlers()` method
     * Add basic support for 301 and 302 status codes with auto-redirection

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,5 +1,7 @@
 
-const testRunner = require('./qunit-puppeteer.js');
+/* jshint ignore:start */
+var testRunner = require('./qunit-puppeteer.js');
+/* jshint ignore:end */
 
 module.exports = function(grunt) {
 	'use strict';
@@ -172,7 +174,9 @@ module.exports = function(grunt) {
 	grunt.registerTask('build', ['dev', 'concat', 'uglify', 'test:dist']);
 	grunt.registerTask('default', ['dev']);
 
+	/* jshint ignore:start */
 	grunt.registerTask('test', 'Executes QUnit tests with all supported jQuery versions', async function() {
+	/* jshint ignore:end */
 		var done = this.async();
 
 		var i, l,
@@ -201,15 +205,19 @@ module.exports = function(grunt) {
 		}
 
 		console.log(versionUrls);
-		for (let i=0; i<versionUrls.length; ++i) {
-			console.log('LOADING', versionUrls[i]);
+		for (i=0; i<versionUrls.length; ++i) {
 			try {
+				console.log('LOADING', versionUrls[i]);
+				/* jshint ignore:start */
 				await testRunner(versionUrls[i], PORT);
+				/* jshint ignore:end */
 			} catch(err) {
 				return done(err);
 			}
 		}
 		done();
+	/* jshint ignore:start */
 	});
+	/* jshint ignore:end */
 
 };
diff --git a/README.md b/README.md
@@ -765,10 +765,10 @@ We use virtual machines to test current versions of the browsers below. In addit
 we test the specific versions of IE specified.
 
 * Internet Explorer 8-11
+* Edge
 * Firefox
 * Safari
 * Chrome
-* Opera
 
 _Please note that while we strive to keep `master` as bug free as possible, we do
 not necessarily run tests in all of the above browsers for every single commit. We

diff --git a/dist/jquery.mockjax.js b/dist/jquery.mockjax.js
@@ -1,7 +1,7 @@
 /*! jQuery Mockjax
  * A Plugin providing simple and flexible mocking of ajax requests and responses
  * 
- * Version: 2.3.0
+ * Version: 2.4.0
  * Home: https://github.com/jakerella/jquery-mockjax
  * Copyright (c) 2018 Jordan Kasper, formerly appendTo;
  * NOTE: This repository was taken over by Jordan Kasper (@jakerella) October, 2014
@@ -286,9 +286,14 @@
 						} else {
 							this.responseText = mockHandler.responseText;
 						}
-						if( typeof mockHandler.status === 'number' || typeof mockHandler.status === 'string' ) {
+
+						if ($.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') {
 							this.status = mockHandler.status;
 						}
+
 						if( typeof mockHandler.statusText === 'string') {
 							this.statusText = mockHandler.statusText;
 						}

diff --git a/dist/jquery.mockjax.min.js b/dist/jquery.mockjax.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jquery-mockjax",
   "title": "jQuery Mockjax",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "main": "./src/jquery.mockjax.js",
   "description": "The jQuery Mockjax Plugin provides a simple and extremely flexible interface for mocking or simulating ajax requests and responses.",
   "url": "https://github.com/jakerella/jquery-mockjax",

diff --git a/src/jquery.mockjax.js b/src/jquery.mockjax.js
@@ -275,14 +275,14 @@
 						} else {
 							this.responseText = mockHandler.responseText;
 						}
-						
+
 						if ($.isArray(mockHandler.status)) {
-							var idxStatus = Math.floor(Math.random() * mockHandler.status.length)
-							this.status = mockHandler.status[idxStatus];							
+							var idxStatus = Math.floor(Math.random() * mockHandler.status.length);
+							this.status = mockHandler.status[idxStatus];
 						} else if (typeof mockHandler.status === 'number' || typeof mockHandler.status === 'string') {
 							this.status = mockHandler.status;
 						}
-						
+
 						if( typeof mockHandler.statusText === 'string') {
 							this.statusText = mockHandler.statusText;
 						}