Merge pull request #342 from jakerella/v2.5.0

PR for v2.5.0

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2018-07-29 v2.5.0
+    * Added support for ignoring test files in the automated runs; this was necessary
+      because Browserstack does something weird with the console and it causes
+      the logging tests to timeout
+    * Fixed Browserstack automated runs by ignoring logging tests
+    * Added an option to reverse the mock handler priority order (thanks @addepar-andy)
+
 ## 2018-06-17 v2.4.0
     * Added support for an array of status codes in mocked response (thanks @reinrl)
     * Updated broken Codacy badge

Gruntfile.js

@@ -6,12 +6,15 @@ var testRunner = require('./qunit-puppeteer.js');
 module.exports = function(grunt) {
 	'use strict';
 
+	/* jshint ignore:start */
+	/* This is used in an await statement, which apaprently JSHint doesn't like */
 	var PORT = 4000;
+	/* jshint ignore:end */
 
 	// Project configuration
 	var config = require('./grunt-config-options');
 	config.pkg = grunt.file.readJSON('package.json');
-	
+
 	grunt.initConfig(config);
 
 	require('load-grunt-tasks')(grunt);
@@ -24,7 +27,7 @@ module.exports = function(grunt) {
 	grunt.registerTask('test', 'Executes QUnit tests with all supported jQuery versions', async function() {
 	/* jshint ignore:end */
 		var done = this.async();
-		var i, l;
+		var i;
 
 		var versionUrls = require('./test/build-version-urls')(grunt.config, arguments[0], arguments[1], arguments[2]);
 

dist/jquery.mockjax.js

@@ -1,7 +1,7 @@
 /*! jQuery Mockjax
  * A Plugin providing simple and flexible mocking of ajax requests and responses
  * 
- * Version: 2.4.0
+ * Version: 2.5.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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "jquery-mockjax",
   "title": "jQuery Mockjax",
-  "version": "2.4.0",
+  "version": "2.5.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",

test/build-version-urls.js

@@ -30,8 +30,8 @@ module.exports = function buildVersionURLs(config, arg1, arg2, arg3, arg4) {
     for (i=0, l=versions.length; i<l; ++i) {
         if (arg1 === 'requirejs') {
             url = 'test/requirejs/' + file + '?jquery=' + versions[i] + '&testFiles=' + testFiles + '&ignoreFiles=' + ignoreFiles;
-            versionUrls.push( url );
             if (!config.onlyPaths) { url = baseURL + '/' + url; }
+            versionUrls.push( url );
         } else {
             url = 'test/' + file + '?jquery=' + versions[i] + '&testFiles=' + testFiles + '&ignoreFiles=' + ignoreFiles;
             if (!config.onlyPaths) { url = baseURL + '/' + url; }