Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ git:
script: cross-env NODE_ENV=test ./node_modules/.bin/mocha --ui bdd --reporter spec
--colors --compilers js:babel-core/register server/tests --recursive
after_script:
- yarn report-coverage
- npm report-coverage
before_script:
- npm install -g gulp-cli
deploy:
Expand Down
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@
"private": false,
"engines": {
"node": ">=4.8.0",
"npm": ">=2.15.11",
"yarn": ">=0.20.3"
"npm": ">=2.15.11"
},
"scripts": {
"start": "gulp serve",
"start:debug": "cross-env DEBUG=express-mongoose-es6-rest-api:* yarn start",
"start:debug": "cross-env DEBUG=express-mongoose-es6-rest-api:* npm start",
"build": "gulp",
"lint": "esw *.js server config --color",
"lint:watch": "yarn lint -- --watch",
"lint:watch": "npm lint -- --watch",
"test": "cross-env NODE_ENV=test ./node_modules/.bin/mocha --ui bdd --reporter spec --colors --compilers js:babel-core/register server/tests --recursive",
"test:watch": "yarn test -- --watch",
"test:watch": "npm test -- --watch",
"test:coverage": "cross-env NODE_ENV=test ./node_modules/.bin/istanbul cover _mocha -- --ui bdd --reporter spec --colors --compilers js:babel-core/register server/tests --recursive",
"test:check-coverage": "yarn test:coverage && istanbul check-coverage",
"test:check-coverage": "npm test:coverage && istanbul check-coverage",
"report-coverage": "coveralls < ./coverage/lcov.info"
},
"repository": {
Expand Down
10 changes: 5 additions & 5 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ git config user.email "surabhisharma.226005@gmail.com"

#git remote add upstream "https://$GH_TOKEN@github.com/rust-lang/rust-by-example.git"
# git remote add upstream "https://github.com/surabhi226005/express-mongoose-es6-rest-api.git"
echo "Remote branch added"
git fetch
echo "Remote fetched"
git branch --track develop origin/develop
git branch
# echo "Remote branch added"
# git fetch
# echo "Remote fetched"
# git branch --track develop origin/develop
# git branch
git checkout develop
git pull