From 1a17d16dc96a7df70bfc3513ab017606949ced5f Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Fri, 4 Mar 2016 09:37:44 -0500 Subject: [PATCH 1/2] Better support for windows builds --- .travis.yml | 2 +- package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53dc9acc7a..2e85f31ee0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ node_js: - "4.3" env: global: - - CODE_COVERAGE=1 + - COVERAGE_OPTION='./node_modules/babel-istanbul/lib/cli.js cover -x **/spec/**' matrix: - MONGODB_VERSION=2.6.11 - MONGODB_VERSION=3.0.8 diff --git a/package.json b/package.json index f2f863f006..4331ea2548 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,9 @@ "dev": "npm run build && bin/dev", "build": "./node_modules/.bin/babel src/ -d lib/", "pretest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.0.8} ./node_modules/.bin/mongodb-runner start", - "test": "cross-env NODE_ENV=test TESTING=1 ./node_modules/.bin/babel-node $(if [ \"$CODE_COVERAGE\" = \"1\" ]; then echo './node_modules/babel-istanbul/lib/cli.js cover -x **/spec/**'; fi;) ./node_modules/jasmine/bin/jasmine.js", + "test": "cross-env NODE_ENV=test TESTING=1 ./node_modules/.bin/babel-node $COVERAGE_OPTION ./node_modules/jasmine/bin/jasmine.js", "posttest": "mongodb-runner stop", + "coverage": "cross-env COVERAGE_OPTION='./node_modules/babel-istanbul/lib/cli.js cover -x **/spec/**' npm test", "start": "./bin/parse-server", "prepublish": "npm run build" }, From ee38ebc4a3f41d52e08d521a2c7707b443805570 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Fri, 4 Mar 2016 09:40:47 -0500 Subject: [PATCH 2/2] Removes shebang for windows --- bin/parse-server | 1 - package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/parse-server b/bin/parse-server index d3ade1e847..94ffe96439 100755 --- a/bin/parse-server +++ b/bin/parse-server @@ -1,2 +1 @@ -#!/usr/bin/env node require("../lib/cli/parse-server"); diff --git a/package.json b/package.json index 4331ea2548..d2a0294ce1 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "test": "cross-env NODE_ENV=test TESTING=1 ./node_modules/.bin/babel-node $COVERAGE_OPTION ./node_modules/jasmine/bin/jasmine.js", "posttest": "mongodb-runner stop", "coverage": "cross-env COVERAGE_OPTION='./node_modules/babel-istanbul/lib/cli.js cover -x **/spec/**' npm test", - "start": "./bin/parse-server", + "start": "node ./bin/parse-server", "prepublish": "npm run build" }, "engines": {