Skip to content

Commit

Permalink
Merge pull request #358 from jakerella/v2.6.0
Browse files Browse the repository at this point in the history
Updates to release v2.6.0
  • Loading branch information
jakerella committed Aug 22, 2020
2 parents 5693c5a + 832896d commit 2a143bc
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 28 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2020-08-22 v2.6.0
* Removed support for IE 9 & 10
* Removed unused config for code climate
* Updated dev dependencies to fix browserstack and local test run issues
* Added support for regex url matching when using a namespace (thanks @gregid)

## 2020-03-30 v2.5.1
* Fixed issue with capitalization of the "content-type" header
* Added newer version of jQuery for testing
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[![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==--fd0f170c41cb4b3eac0a35aaef09b1ead3b55a0c)](https://automate.browserstack.com/public-build/alZyelpKSWI1WlpxellOQXdPUHBMd2UvQnFmTTFnOEJ2V1FSVXo3a3JPbz0tLWk4alJ6aXJWZVV6bmN6QUZBUTQ5UVE9PQ==--fd0f170c41cb4b3eac0a35aaef09b1ead3b55a0c)
[![BrowserStack Status](https://automate.browserstack.com/badge.svg?badge_key=VTdsNjQzSDZvSXA2ZDhsamFkaG5pWWVFTmUwWDdmRmltTkFoY2VVR01COD0tLWVrSXY0YTJwWXNiZ2tlbmxBNTBpUmc9PQ==--e3dabee1a4e801501ff510bef8292859e10cb008)](https://automate.browserstack.com/public-build/VTdsNjQzSDZvSXA2ZDhsamFkaG5pWWVFTmUwWDdmRmltTkFoY2VVR01COD0tLWVrSXY0YTJwWXNiZ2tlbmxBNTBpUmc9PQ==--e3dabee1a4e801501ff510bef8292859e10cb008)

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.

Expand Down Expand Up @@ -821,7 +821,7 @@ the specific versions of Internet Explorer specified.
* Firefox
* Chrome
* Safari
* Internet Explorer 9-11
* Internet Explorer 11 (although it may work on IE 9 & 10)

Each PR will run these tests using TravisCI for continuous integration before
code is merged into master to ensure we do not introduce regressions.
Expand Down
2 changes: 0 additions & 2 deletions browserstack-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ module.exports = {
"firefox_latest",
"safari_latest",
"edge_latest",
"ie_9",
"ie_10",
"ie_11"
]
};
6 changes: 3 additions & 3 deletions browserstack.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

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

console.log(config);

browserstackRunner.run(config, function(err, report) {
if (err) {
return console.error('BrowserStack Error', err);
}
console.log('All Done!');
console.log(JSON.stringify(report, null, 2));
});
2 changes: 1 addition & 1 deletion dist/jquery.mockjax.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! jQuery Mockjax
* A Plugin providing simple and flexible mocking of ajax requests and responses
*
* Version: 2.5.1
* Version: 2.6.0
* Home: https://github.com/jakerella/jquery-mockjax
* Copyright (c) 2020 Jordan Kasper, formerly appendTo;
* NOTE: This repository was taken over by Jordan Kasper (@jakerella) October, 2014
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.mockjax.min.js

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "jquery-mockjax",
"title": "jQuery Mockjax",
"version": "2.5.1",
"version": "2.6.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",
Expand Down Expand Up @@ -53,23 +53,23 @@
"jquery": ">=1.5.2"
},
"devDependencies": {
"browserify": "^13.1.0",
"browserstack-runner": "^0.7.0",
"grunt": "^1.0.1",
"grunt-browserify": "^5.0.0",
"browserify": "^16.5.2",
"browserstack-runner": "^0.9.3",
"grunt": "^1.3.0",
"grunt-browserify": "^5.3.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-jshint": "^1.1.0",
"grunt-contrib-qunit": "^1.2.0",
"grunt-contrib-uglify": "^2.0.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-mocha-test": "^0.12.7",
"http-server": "^0.11.1",
"jsdom": "~4.2.0",
"load-grunt-tasks": "^0.6.0",
"mocha": "^2.2.4",
"puppeteer": "^1.1.1",
"sinon": "^1.17.4",
"xmlhttprequest": "^1.7.0"
"grunt-contrib-connect": "^3.0.0",
"grunt-contrib-jshint": "^2.1.0",
"grunt-contrib-qunit": "^4.0.0",
"grunt-contrib-uglify": "^5.0.0",
"grunt-contrib-watch": "^1.1.0",
"grunt-mocha-test": "^0.13.3",
"http-server": "^0.12.3",
"jsdom": "^16.4.0",
"load-grunt-tasks": "^5.1.0",
"mocha": "^8.1.1",
"puppeteer": "^5.2.1",
"sinon": "^9.0.3",
"xmlhttprequest": "^1.8.0"
}
}
2 changes: 1 addition & 1 deletion test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<script src='../lib/qunit.js'></script>
<script>if (/HeadlessChrome/.test(window.navigator.userAgent)) { QUnit.config.autostart = false; }</script>
<script src='../node_modules/sinon/pkg/sinon.js'></script>
<script src='jquery.js'></script>>
<script src='jquery.js'></script>
<script src='../lib/json2.js'></script>
<script src='../lib/semver.js'></script>
<script src='../src/jquery.mockjax.js'></script>
Expand Down

0 comments on commit 2a143bc

Please sign in to comment.