From 2cd2d30d7c95d5a329c841f370e39856fe4a79ef Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Mon, 2 Jan 2017 16:26:59 +0100 Subject: [PATCH] Use "jshint" directly for linting (#32) --- .travis.yml | 2 +- package.json | 10 ++++------ test/jshint.spec.js | 3 --- 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 test/jshint.spec.js diff --git a/.travis.yml b/.travis.yml index a03d5d02..bf70627f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ script: # Usually, it's ok to finish the test scenario without reverting # to the addon's original dependency state, skipping "cleanup". - npm test -- --skip-cleanup - - npm run mocha + - npm run lint notifications: email: false diff --git a/package.json b/package.json index 953747f8..1986967c 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "scripts": { "build": "ember build", - "mocha": "mocha", + "lint": "jshint config test-support tests *.js", "start": "ember server", "test": "ember try:each" }, @@ -27,7 +27,6 @@ "ember-cli-htmlbars": "^1.0.10", "ember-cli-htmlbars-inline-precompile": "^0.3.3", "ember-cli-inject-live-reload": "^1.4.1", - "ember-cli-jshint": "^1.0.4", "ember-cli-qunit": "^3.0.1", "ember-cli-release": "^0.2.9", "ember-cli-sri": "^2.1.0", @@ -38,16 +37,15 @@ "ember-export-application-global": "^1.0.5", "ember-load-initializers": "^0.5.1", "ember-resolver": "^2.0.3", - "loader.js": "^4.0.10", - "mocha": "^1.21.4", - "mocha-jshint": "^2.3.1" + "jshint": "^2.9.4", + "loader.js": "^4.0.10" }, "keywords": [ "ember-addon" ], "dependencies": { "ember-cli-babel": "^5.1.7", - "lodash": "^4.0.0" + "lodash": "^4.0.0" }, "ember-addon": { "configPath": "tests/dummy/config", diff --git a/test/jshint.spec.js b/test/jshint.spec.js deleted file mode 100644 index e9f15934..00000000 --- a/test/jshint.spec.js +++ /dev/null @@ -1,3 +0,0 @@ -require('mocha-jshint')({ - paths: ['./strip-test-selectors.js'] -});