]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge remote-tracking branch 'zurb/develop' into chore/various-travis-tests-improvments 11090/head
authorNicolas Coden <nicolas@ncoden.fr>
Tue, 3 Apr 2018 09:22:37 +0000 (11:22 +0200)
committerNicolas Coden <nicolas@ncoden.fr>
Tue, 3 Apr 2018 09:22:37 +0000 (11:22 +0200)
1  2 
package-lock.json
package.json

Simple merge
diff --cc package.json
index 9b12b9f47b82083abd0f8b1cb668390ea52b87b8,8b67267bb17e233410db424247cf0c123e51e418..382933e19dc2080e06c6471df9e1563f6a18ab48
      "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",