Merge branch 'master' into makefile-tests
authorAnike Arni <anikarni@gmail.com>
Mon, 13 Mar 2017 21:41:59 +0000 (18:41 -0300)
committerGitHub <noreply@github.com>
Mon, 13 Mar 2017 21:41:59 +0000 (18:41 -0300)
1  2 
Makefile
web-ui/package.json

diff --cc Makefile
Simple merge
      "webpack": "^1.14.0"
    },
    "scripts": {
-     "test": "npm run jshint --silent && npm run build-statics --silent && npm run mocha-test && npm run karma-test",
-     "mocha-test": "mocha-webpack --webpack-config webpack.test.config.js \"test/spec/account_recovery/**/*.spec.js\"",
-     "karma-test": "karma start --single-run $GRUNT_OPTS",
-     "debug": "npm run build && karma start --browsers Chrome $GRUNT_OPTS",
-     "watch": "npm run compass-watch & npm run handlebars-watch & npm run build-js-watch",
-     "watch-test": "karma start",
-     "handlebars": "mkdir -p app/js/generated/hbs/ && handlebars app/templates/**/*.hbs > app/js/generated/hbs/templates.js --namespace=window.Pixelated --root .",
-     "handlebars-watch": "watch 'npm run handlebars' app/templates",
-     "compass": "compass compile",
-     "compass-watch": "compass watch",
-     "build": "npm run build-statics && npm run build-js",
-     "build-statics": "npm run clean && npm run handlebars && npm run add_git_version && npm run compass",
-     "build-prod": "npm run build-statics && webpack -p --config ./webpack.production.config.js",
-     "build-js": "webpack --colors --progress",
-     "build-js-watch": "webpack --colors --progress --watch",
-     "jshint": "jshint --config=.jshintrc app test",
+     "test": "npm run lint --silent && npm run build:statics --silent && npm run test:unit && npm run test:integration",
+     "test:unit": "npm run test:coverage && npm run test:karma",
+     "test:integration": "mocha-webpack --webpack-config webpack.test.config.js --require test/integration/setup.js \"test/integration/**/*.spec.js\"",
+     "test:coverage": "NODE_ENV=test nyc --check-coverage npm run test:mocha",
+     "test:mocha": "mocha-webpack --webpack-config webpack.test.config.js \"src/**/*.spec.js\"",
+     "test:karma": "karma start --single-run $GRUNT_OPTS",
+     "test:watch:mocha": "npm run test:mocha -- --watch",
+     "test:watch:karma": "karma start",
+     "lint": "npm run lint:jshint && npm run lint:eslint",
+     "lint:jshint": "jshint --config=.jshintrc app test",
+     "lint:eslint": "eslint src test/unit",
+     "build": "npm run build:statics && npm run build:js",
+     "build:debug": "npm run build && karma start --browsers Chrome $GRUNT_OPTS",
+     "build:statics": "npm run clean && npm run build:handlebars && npm run add_git_version && npm run build:compass",
+     "build:prod": "npm run build:statics && webpack -p --config ./webpack.production.config.js",
+     "build:js": "webpack --colors --progress",
+     "build:compass": "compass compile",
+     "build:handlebars": "mkdir -p app/js/generated/hbs/ && handlebars app/templates/**/*.hbs > app/js/generated/hbs/templates.js --namespace=window.Pixelated --root .",
+     "watch": "npm run watch:compass & npm run watch:handlebars & npm run watch:js",
+     "watch:handlebars": "watch 'npm run build:handlebars' app/templates",
+     "watch:compass": "compass watch",
+     "watch:js": "webpack --colors --progress --watch",
 -    "clean": "rm -rf dist/ app/js/generated/hbs/* app/css/*",
 +    "clean": "rm -rf app/js/generated/hbs/* app/css/*",
-     "package": "PIXELATED_BUILD='package' npm run build-prod && npm run imagemin",
      "imagemin": "node config/imagemin.js",
+     "package": "npm run build:prod && npm run imagemin",
      "add_git_version": "/bin/bash config/add_git_version.sh"
+   },
+   "nyc": {
+     "include": [
+       "src/**/*.js"
+     ]
    }
  }