Merge pull request #353 from jakerella/header-bug

Fix bug in content-type header
jakerella · Mar 30, 2020 · 21c171e · 21c171e
2 parents 6b29cbd + 53cc1a5
commit 21c171e
Show file tree

Hide file tree

Showing 14 changed files with 10,625 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ before_script:
   - "sudo chmod 4755 /opt/google/chrome/chrome-sandbox"
 language: node_js
 node_js:
-  - "8.9.4"
+  - "12.16.1"
 before_install: npm install -g grunt-cli
 branches:
   only:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2020-03-30 v2.5.1
+    * Fixed issue with capitalization of the "content-type" header
+    * Added newer version of jQuery for testing
+    * Fixed issue where we were not running one subset of tests
+
 ## 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

diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # jQuery Mockjax: Ajax request mocking #
 [http://github.com/jakerella/jquery-mockjax/](http://github.com/jakerella/jquery-mockjax/)
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/72d5f8c1c29ee60f6282d7d3fa9cb52c)](https://www.codacy.com/app/mikehostetler_1249/jquery-mockjax?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=appendto/jquery-mockjax)
-[![Travis CI Badge](https://travis-ci.org/jakerella/jquery-mockjax.svg?branch=master)](https://travis-ci.org/jakerella/jquery-mockjax)
-[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=REpZNzZpeWkzMTY2dERuTkkyYVpnTmM1SmZKMGE5cjdVNEVZNjNYelk3ND0tLXpsRGJjaTNhM0RYNnZoVjU2QXVCRnc9PQ==--7bb0e1bf6af34ba1b15703463673c619b1daf292)](https://www.browserstack.com/automate/public-build/REpZNzZpeWkzMTY2dERuTkkyYVpnTmM1SmZKMGE5cjdVNEVZNjNYelk3ND0tLXpsRGJjaTNhM0RYNnZoVjU2QXVCRnc9PQ==--7bb0e1bf6af34ba1b15703463673c619b1daf292)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/72d5f8c1c29ee60f6282d7d3fa9cb52c)](https://www.codacy.com/app/mikehostetler_1249/jquery-mockjax)
+[![Travis CI Badge](https://travis-ci.com/jakerella/jquery-mockjax.svg?branch=master)](https://travis-ci.com/jakerella/jquery-mockjax)
+[![BrowserStack Status](https://automate.browserstack.com/badge.svg?badge_key=alZyelpKSWI1WlpxellOQXdPUHBMd2UvQnFmTTFnOEJ2V1FSVXo3a3JPbz0tLWk4alJ6aXJWZVV6bmN6QUZBUTQ5UVE9PQ==--fd0f170c41cb4b3eac0a35aaef09b1ead3b55a0cjquery-mockjax)](https://automate.browserstack.com/public-build/alZyelpKSWI1WlpxellOQXdPUHBMd2UvQnFmTTFnOEJ2V1FSVXo3a3JPbz0tLWk4alJ6aXJWZVV6bmN6QUZBUTQ5UVE9PQ==--fd0f170c41cb4b3eac0a35aaef09b1ead3b55a0cjquery-mockjax)
 
 There are some minor breaking changes in v2, so if you need an older version, please check the [v1.x](https://github.com/jakerella/jquery-mockjax/tree/v1.x) branch or the list of [releases](https://github.com/jakerella/jquery-mockjax/tags) in Github.
 

diff --git a/dist/jquery.mockjax.js b/dist/jquery.mockjax.js
@@ -1,9 +1,9 @@
 /*! jQuery Mockjax
  * A Plugin providing simple and flexible mocking of ajax requests and responses
  * 
- * Version: 2.5.0
+ * Version: 2.5.1
  * Home: https://github.com/jakerella/jquery-mockjax
- * Copyright (c) 2018 Jordan Kasper, formerly appendTo;
+ * Copyright (c) 2020 Jordan Kasper, formerly appendTo;
  * NOTE: This repository was taken over by Jordan Kasper (@jakerella) October, 2014
  * 
  * Dual licensed under the MIT or GPL licenses.
@@ -424,7 +424,7 @@
 				var headers = '';
 				// since jQuery 1.9 responseText type has to match contentType
 				if (mockHandler.contentType) {
-					mockHandler.headers['Content-Type'] = mockHandler.contentType;
+					mockHandler.headers['content-type'] = mockHandler.contentType;
 				}
 				$.each(mockHandler.headers, function(k, v) {
 					headers += k + ': ' + v + '\n';

diff --git a/dist/jquery.mockjax.min.js b/dist/jquery.mockjax.min.js
diff --git a/grunt-config-options.js b/grunt-config-options.js
@@ -78,7 +78,8 @@ module.exports = {
                 '3.0.0',
                 '3.1.1',
                 '3.2.1',
-                '3.3.1'
+                '3.3.1',
+                '3.4.1'
             ]
         },
         requirejs: {
@@ -88,22 +89,22 @@ module.exports = {
                 '1.9.1',
                 '1.12.4',
                 '2.2.4',
-                '3.3.1'
+                '3.4.1'
             ]
         },
         latestInBranch: {
             jQueryVersions: [
                 '1.12.4',
                 '2.2.4',
-                '3.3.1'
+                '3.4.1'
             ]
         },
         oldestAndLatest: {
             jQueryVersions: [
                 '1.5.2',
                 '1.12.4',
                 '2.2.4',
-                '3.3.1'
+                '3.4.1'
             ]
         },
         edge: {
@@ -126,7 +127,8 @@ module.exports = {
                 '3.0.0',
                 '3.1.1',
                 '3.2.1',
-                '3.3.1'
+                '3.3.1',
+                '3.4.1'
             ]
         },
         browserify: {