Skip to content

Commit 2a143bc

Browse files
authored
Merge pull request #358 from jakerella/v2.6.0
Updates to release v2.6.0
2 parents 5693c5a + 832896d commit 2a143bc

File tree

8 files changed

+32
-28
lines changed

8 files changed

+32
-28
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 2020-08-22 v2.6.0
2+
* Removed support for IE 9 & 10
3+
* Removed unused config for code climate
4+
* Updated dev dependencies to fix browserstack and local test run issues
5+
* Added support for regex url matching when using a namespace (thanks @gregid)
6+
17
## 2020-03-30 v2.5.1
28
* Fixed issue with capitalization of the "content-type" header
39
* Added newer version of jQuery for testing

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/72d5f8c1c29ee60f6282d7d3fa9cb52c)](https://www.codacy.com/app/mikehostetler_1249/jquery-mockjax)
55
[![Travis CI Badge](https://travis-ci.com/jakerella/jquery-mockjax.svg?branch=master)](https://travis-ci.com/jakerella/jquery-mockjax)
6-
[![BrowserStack Status](https://automate.browserstack.com/badge.svg?badge_key=alZyelpKSWI1WlpxellOQXdPUHBMd2UvQnFmTTFnOEJ2V1FSVXo3a3JPbz0tLWk4alJ6aXJWZVV6bmN6QUZBUTQ5UVE9PQ==--fd0f170c41cb4b3eac0a35aaef09b1ead3b55a0c)](https://automate.browserstack.com/public-build/alZyelpKSWI1WlpxellOQXdPUHBMd2UvQnFmTTFnOEJ2V1FSVXo3a3JPbz0tLWk4alJ6aXJWZVV6bmN6QUZBUTQ5UVE9PQ==--fd0f170c41cb4b3eac0a35aaef09b1ead3b55a0c)
6+
[![BrowserStack Status](https://automate.browserstack.com/badge.svg?badge_key=VTdsNjQzSDZvSXA2ZDhsamFkaG5pWWVFTmUwWDdmRmltTkFoY2VVR01COD0tLWVrSXY0YTJwWXNiZ2tlbmxBNTBpUmc9PQ==--e3dabee1a4e801501ff510bef8292859e10cb008)](https://automate.browserstack.com/public-build/VTdsNjQzSDZvSXA2ZDhsamFkaG5pWWVFTmUwWDdmRmltTkFoY2VVR01COD0tLWVrSXY0YTJwWXNiZ2tlbmxBNTBpUmc9PQ==--e3dabee1a4e801501ff510bef8292859e10cb008)
77

88
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.
99

@@ -821,7 +821,7 @@ the specific versions of Internet Explorer specified.
821821
* Firefox
822822
* Chrome
823823
* Safari
824-
* Internet Explorer 9-11
824+
* Internet Explorer 11 (although it may work on IE 9 & 10)
825825

826826
Each PR will run these tests using TravisCI for continuous integration before
827827
code is merged into master to ensure we do not introduce regressions.

browserstack-config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ module.exports = {
1414
"firefox_latest",
1515
"safari_latest",
1616
"edge_latest",
17-
"ie_9",
18-
"ie_10",
1917
"ie_11"
2018
]
2119
};

browserstack.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

2-
var browserstackRunner = require('browserstack-runner'),
3-
config = require('./browserstack-config');
2+
const browserstackRunner = require('browserstack-runner');
3+
const config = require('./browserstack-config');
44

55
console.log(config);
66

77
browserstackRunner.run(config, function(err, report) {
88
if (err) {
99
return console.error('BrowserStack Error', err);
1010
}
11-
console.log('All Done!');
11+
console.log(JSON.stringify(report, null, 2));
1212
});

dist/jquery.mockjax.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*! jQuery Mockjax
22
* A Plugin providing simple and flexible mocking of ajax requests and responses
33
*
4-
* Version: 2.5.1
4+
* Version: 2.6.0
55
* Home: https://github.com/jakerella/jquery-mockjax
66
* Copyright (c) 2020 Jordan Kasper, formerly appendTo;
77
* NOTE: This repository was taken over by Jordan Kasper (@jakerella) October, 2014

dist/jquery.mockjax.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jquery-mockjax",
33
"title": "jQuery Mockjax",
4-
"version": "2.5.1",
4+
"version": "2.6.0",
55
"main": "./src/jquery.mockjax.js",
66
"description": "The jQuery Mockjax Plugin provides a simple and extremely flexible interface for mocking or simulating ajax requests and responses.",
77
"url": "https://github.com/jakerella/jquery-mockjax",
@@ -53,23 +53,23 @@
5353
"jquery": ">=1.5.2"
5454
},
5555
"devDependencies": {
56-
"browserify": "^13.1.0",
57-
"browserstack-runner": "^0.7.0",
58-
"grunt": "^1.0.1",
59-
"grunt-browserify": "^5.0.0",
56+
"browserify": "^16.5.2",
57+
"browserstack-runner": "^0.9.3",
58+
"grunt": "^1.3.0",
59+
"grunt-browserify": "^5.3.0",
6060
"grunt-contrib-concat": "^1.0.1",
61-
"grunt-contrib-connect": "^1.0.2",
62-
"grunt-contrib-jshint": "^1.1.0",
63-
"grunt-contrib-qunit": "^1.2.0",
64-
"grunt-contrib-uglify": "^2.0.0",
65-
"grunt-contrib-watch": "^1.0.0",
66-
"grunt-mocha-test": "^0.12.7",
67-
"http-server": "^0.11.1",
68-
"jsdom": "~4.2.0",
69-
"load-grunt-tasks": "^0.6.0",
70-
"mocha": "^2.2.4",
71-
"puppeteer": "^1.1.1",
72-
"sinon": "^1.17.4",
73-
"xmlhttprequest": "^1.7.0"
61+
"grunt-contrib-connect": "^3.0.0",
62+
"grunt-contrib-jshint": "^2.1.0",
63+
"grunt-contrib-qunit": "^4.0.0",
64+
"grunt-contrib-uglify": "^5.0.0",
65+
"grunt-contrib-watch": "^1.1.0",
66+
"grunt-mocha-test": "^0.13.3",
67+
"http-server": "^0.12.3",
68+
"jsdom": "^16.4.0",
69+
"load-grunt-tasks": "^5.1.0",
70+
"mocha": "^8.1.1",
71+
"puppeteer": "^5.2.1",
72+
"sinon": "^9.0.3",
73+
"xmlhttprequest": "^1.8.0"
7474
}
7575
}

test/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<script src='../lib/qunit.js'></script>
66
<script>if (/HeadlessChrome/.test(window.navigator.userAgent)) { QUnit.config.autostart = false; }</script>
77
<script src='../node_modules/sinon/pkg/sinon.js'></script>
8-
<script src='jquery.js'></script>>
8+
<script src='jquery.js'></script>
99
<script src='../lib/json2.js'></script>
1010
<script src='../lib/semver.js'></script>
1111
<script src='../src/jquery.mockjax.js'></script>

0 commit comments

Comments
 (0)