Skip to content
This repository has been archived by the owner on Dec 16, 2023. It is now read-only.

Commit

Permalink
Updated npm dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
assaf committed Nov 14, 2014
1 parent 39e2211 commit d40e8a7
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

ADDED window.location.origin #796

FIXED updated to JSDOM 1.2.1

682 passing
10 sec to complete


## Version 2.1.1 2014-10-23

Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
"node": "0.10.x"
},
"dependencies": {
"bluebird": "^2.3.10",
"bluebird": "^2.3.11",
"debug": "^2.0.0",
"eventsource": "^0.1.4",
"iconv-lite": "^0.4.4",
"jsdom": "1.1.0",
"jsdom": "1.2.1",
"mime": "^1.2.11",
"ms": "^0.6.2",
"request": "^2.47.0",
"request": "^2.48.0",
"tough-cookie": "^0.12.1",
"ws": "0.4.32"
},
Expand All @@ -57,19 +57,19 @@
"co": "^3.1.0",
"coffee-script": "^1.8.0",
"cookie-parser": "^1.3.3",
"express": "^4.10.1",
"gulp": "^3.8.9",
"express": "^4.10.2",
"gulp": "^3.8.10",
"gulp-clean": "^0.3.1",
"gulp-coffee": "^2.2.0",
"gulp-exec": "^2.1.1",
"gulp-notify": "^2.0.0",
"gulp-notify": "^2.0.1",
"gulp-util": "^3.0.1",
"mocha": "^2.0.1",
"morgan": "^1.4.1",
"morgan": "^1.5.0",
"multiparty": "^4.0.0",
"replay": "^1.10.3",
"replay": "^1.11.0",
"requirejs": "^2.1.15",
"traceur": "^0.0.72"
"traceur": "^0.0.74"
},
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions test/helpers/brains.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ server.use(bodyParser.json());
server.use(bodyParser.text());
server.use(cookieParser());
server.use(function(req, res, next) {
if (req.method === 'POST' && req.headers['content-type'].split(';')[0] === 'multipart/form-data') {
if (req.method === 'POST' && req.headers['content-type'].search('multipart/') === 0) {

const form = new Multiparty.Form();
form.parse(req, function(error, fields, files) {
Expand Down Expand Up @@ -67,7 +67,7 @@ server.get('/scripts/jquery.js', function(req, res) {
});

server.get('/scripts/require.js', function(req, res) {
const file = Path.resolve(require.resolve('requirejs'), '../../require.js');
const file = Path.resolve('node_modules/requirejs/require.js');
const script = File.readFileSync(file);
res.send(script);
});
Expand Down
1 change: 1 addition & 0 deletions test/mocha.opts
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
--timeout 2s
--growl
--check-leaks
--globals _key

0 comments on commit d40e8a7

Please sign in to comment.