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

Author: ssurabhi10

.travis.yml

@@ -21,7 +21,8 @@ deploy:
 after_success:
   - git config --global user.name "Surabhi Sharma"
   - git config --global user.email surabhisharma.226005@gmail.com
-  - if [ "$TRAVIS_BRANCH" == "develop" ] ; then  git remote rm heroku ; git remote add heroku git@heroku.com:codalyze-test-ci.git ; git add dist/ ; git checkout -b release ; git commit -m "Dist" ; git push heroku release:master ; yes ; fi
+  - if [ "$TRAVIS_BRANCH" == "develop" ] ; then  git remote rm heroku ; git remote add heroku git@heroku.com:codalyze-test-ci.git ; git add dist/ ; git checkout -b release ; git commit -m "Dist" ; git push heroku release:master ; echo -e yes ; fi
+
   # - git add dist/
   # - git checkout -b release
   # - git commit -m "Dist"
@@ -31,4 +32,9 @@ after_success:
 
 #- if [ "$TRAVIS_BRANCH" == "master" ] ; then npm run deploy ; else echo "Skipping after_success" ; fi
 
-# https://git.heroku.com/codalyze-test-ci.git
+
+# https://git.heroku.com/codalyze-test-ci.git
+
+# env:
+#   global:
+#     secure: GaWCIjifcrDR1/bzRo5X5tcZXKfiulC8LcxXmzAD9nL83VNmuXZ5XE9j5Pt5uNtT9J6xDHF9OMnvknJlAKKp6ZmWGU8wQmO4nc/GZFOhZP4jv8v/v0kFFhvDN9YzuBGIl+daafCZ2Ve3wANnxb92qsHC5TsIBRcf/1QGme25tfHqaAGxL165EoecRmbFyFC2biYCj9EyYNxx3gXNB2EPL8M0aLDtXabDHWs3i38G5jZakgYoC0DqGXRubbzl6uJCylawJYoAkk09U8obs6Zv+Z/HkgbR0AjeLVuXd3cwbZkh3uXBw2llFRb/J3T30rfBPgtXDEiI/Qu+uhQSSjf9C4jWu2sVrSizk/6d2wZGlFMIW/549Bi3tSgyhb8PCllTscPGgVaSNAeoBRd3QPj6BVS5u8+DN+hpjGp3sb2IOaWL5NSDd+o8QKQrhSxe5PQDQtmIXZ9vd1Mi9WXCLJiUWSs4R3U4qzEn4b/TiIWKLUqfJg1o++xwZRuUr6GCO3VDcdGcSQOfpr4NCwsZ1QpLY1cbuQGGDzmeviMXy+l0r6wW7knqWmnQBXLcQCqTh0niFok9x4M7Nk3M9Z7vIqa3/bZc7cWUJAk4RFZ3AiO0B1Xw0wpn9cD3tLRasm4SR3HRo5sD4gMvnJY+Fsw3te3jwx7fG/C2hS28jqB9lZJzdl8=

package.json

@@ -20,7 +20,7 @@
     "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": "npm test:coverage && istanbul check-coverage",
     "report-coverage": "coveralls < ./coverage/lcov.info",
-    "travis-script": "npm run lint && npm test && npm run build"
+    "travis-script": "if [ \"$TRAVIS_BRANCH\" = \"develop\" ] ; then npm run lint && npm test && npm run build ; else npm run lint && npm test ; fi"
   },
   "repository": {
     "type": "git",