Merge branch 'develop' into feature/ss/test-ci

Author: ssurabhi10

.travis.yml

@@ -1,24 +1,24 @@
-# language: node_js
-# node_js:
-# - '7.6'
-# services:
-# - mongodb
-# cache:
-#   directories:
-#   - node_modules
-# git:
-#   depth: 3
-# 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
-# before_script:
-# - npm install -g gulp-cli
-# deploy:
-#   app: test-ci
-#   provider: heroku
-#   api_key:
-#     secure: auBdU0dKRsULQaMsTFnt0Gal/YSJSQFgSz1bONqYkm+TFnSlC2W3w1BNUFAqyrUceWT90aieBRau4G9yFNUE6/MGFaxH7a2B1CYraXE2sHXQQ5+vts2mIyeMNnAWiQTiqpMjBvIVKkfLzgOdYgTgNwIZ4b6bSRqd9upCAZAbhoipFNpChSdPtKS6iAr3V7PXlHl1GOyPqURVmhi5r3snHAWk70tp5RZMEX/jSvXnQDFK+YlNyKS4LwpyS1B9UB1C+wLx5MCuijFi6l02ETD21LN3JQG800MKukG3/6Zhec2JbCzlRMMphHJk0fX2bshIpLAEuZzEd0dvOYVTJ5maMuCUijq07PTTIuTOLKCcoZFuKm+sypF9jv4lEVfQUp+dEchrfQyixJNgbuEP6qbbo00i4xzMxPMrj/l0cPI0LSSgupLS4CrrmwiVvqTx30Cr0MXY+sU2uGMNOABHVce6S7QoNv0jst9RlDd2Ab+Q+akD7/ZABGFpOE8AIADP4y9gZcoj92nn8uOpRnISgYGjdBYM9iqksTxiWqwgGWKKWXhr5Gjvc1Ql6y4LBHvtKNDHliMwGs7N9f5PLpWitY50q7NMzwuMH8mO95+WXQ1MFxFORp04p+rscTx7jr8Q+uF/SWZ20BmmmAYIyqMIvREEHKMK/s5xlT7QvrQV/ZENMKU=
+language: node_js
+node_js:
+- '7.6'
+services:
+- mongodb
+cache:
+  directories:
+  - node_modules
+git:
+  depth: 3
+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
+before_script:
+- npm install -g gulp-cli
+deploy:
+  app: test-ci
+  provider: heroku
+  api_key:
+    secure: auBdU0dKRsULQaMsTFnt0Gal/YSJSQFgSz1bONqYkm+TFnSlC2W3w1BNUFAqyrUceWT90aieBRau4G9yFNUE6/MGFaxH7a2B1CYraXE2sHXQQ5+vts2mIyeMNnAWiQTiqpMjBvIVKkfLzgOdYgTgNwIZ4b6bSRqd9upCAZAbhoipFNpChSdPtKS6iAr3V7PXlHl1GOyPqURVmhi5r3snHAWk70tp5RZMEX/jSvXnQDFK+YlNyKS4LwpyS1B9UB1C+wLx5MCuijFi6l02ETD21LN3JQG800MKukG3/6Zhec2JbCzlRMMphHJk0fX2bshIpLAEuZzEd0dvOYVTJ5maMuCUijq07PTTIuTOLKCcoZFuKm+sypF9jv4lEVfQUp+dEchrfQyixJNgbuEP6qbbo00i4xzMxPMrj/l0cPI0LSSgupLS4CrrmwiVvqTx30Cr0MXY+sU2uGMNOABHVce6S7QoNv0jst9RlDd2Ab+Q+akD7/ZABGFpOE8AIADP4y9gZcoj92nn8uOpRnISgYGjdBYM9iqksTxiWqwgGWKKWXhr5Gjvc1Ql6y4LBHvtKNDHliMwGs7N9f5PLpWitY50q7NMzwuMH8mO95+WXQ1MFxFORp04p+rscTx7jr8Q+uF/SWZ20BmmmAYIyqMIvREEHKMK/s5xlT7QvrQV/ZENMKU=
 # after_success:
 #   - bash travis.sh
 # env:

travis.sh

@@ -1,11 +1,11 @@
-# git config user.name "Surabhi Sharma"
-# git config user.email "surabhisharma.226005@gmail.com"
+git config user.name "Surabhi Sharma"
+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
-# git checkout develop
-# git pull
+#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
+git checkout develop
+git pull