From: Nicolas Coden <nicolas@ncoden.fr>
Date: Tue, 3 Apr 2018 09:22:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'zurb/develop' into chore/various-travis-tests-improvments
X-Git-Tag: v6.6.0~3^2~248^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5da01c7a650f35e3ece18d0cb6eccfa1f44567f;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge remote-tracking branch 'zurb/develop' into chore/various-travis-tests-improvments
---

e5da01c7a650f35e3ece18d0cb6eccfa1f44567f
diff --cc package.json
index 9b12b9f47,8b67267bb..382933e19
--- a/package.json
+++ b/package.json
@@@ -13,16 -13,18 +13,18 @@@
      "start": "gulp",
      "test": "npm run test:sass && npm run test:javascript:units",
      "test:ci": "npm run test:sass && npm run test:javascript:ci",
-     "test:sass": "mocha test/sass/test_sass.js",
-     "test:javascript:transpile": "gulp sass:foundation && gulp test:transpile-js",
+     "test:sass": "mocha test/sass/test_sass.js --colors",
+     "test:javascript:transpile": "gulp sass:foundation --color && gulp test:transpile-js --color",
 -    "test:javascript:units": "npm run test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -f test/javascript/index.html",
 +    "test:javascript:units": "npm run test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -a no-sandbox -f test/javascript/index.html",
      "test:javascript:browserstack": "npm run test:javascript:transpile && browserstack-runner",
 -    "test:javascript:ci": "npm run test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -f test/javascript/index.html && browserstack-runner",
 +    "test:javascript:ci": "npm run test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -a no-sandbox -f test/javascript/index.html && browserstack-runner",
-     "test:visual": "gulp test",
-     "deploy": "gulp deploy",
-     "deploy:prep": "gulp deploy:prep",
-     "deploy:docs": "gulp deploy:docs",
-     "deploy:beta": "gulp deploy:beta"
+     "test:visual": "gulp test --color",
+     "deploy": "gulp deploy --color",
+     "deploy:prep": "gulp deploy:prep --color",
+     "deploy:docs": "gulp deploy:docs --color",
+     "deploy:beta": "gulp deploy:beta --color",
+     "precommit": "node ./script/husky-precommit.js  --color",
+     "prepush": "node ./script/husky-prepush.js  --color"
    },
    "dependencies": {
      "jquery": ">=3.0.0",