Merged in RES-2077-vpn-use-resin-lint (pull request #88)

Use resin-lint
balena-io · Mar 24, 2016 · 17f1036 · 17f1036
2 parents eb6d4b3 + ef3a398
commit 17f1036
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 138 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* Use resin-lint [Internal] [Kostas]
 * Remove device port 4200 from web access whitelist [External] [Kostas]
 * Updated dependencies [Internal] [Page]
 * Reduce noise in logs [Internal] [Kostas]

diff --git a/automation/test.sh b/automation/test.sh
@@ -27,7 +27,6 @@ test_id=$(docker run \
 docker exec $test_id /bin/sh -c '\
 	npm install \
 	&& systemctl stop resin-vpn.service resin-connect-proxy.service \
-	&& ./node_modules/.bin/coffeelint ./src ./test \
 	&& echo "127.0.0.1 deadbeef.vpn" >> /etc/hosts \
 	&& npm run test-unit \
 	&& ./node_modules/mocha/bin/mocha test/app.coffee'
diff --git a/coffeelint.json b/coffeelint.json
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "description": "RESTful VPN api",
   "main": "server.js",
   "scripts": {
+    "pretest-unit": "resin-lint src/ test/",
     "test-unit": "mocha test/index.coffee",
     "test": "docker build -t test-resin-vpn . && IMAGE_NAME=test-resin-vpn ./automation/test.sh"
   },
@@ -32,13 +33,13 @@
   "devDependencies": {
     "chai": "^3.0.0",
     "chai-as-promised": "^5.1.0",
-    "coffeelint": "^1.10.1",
     "duplexer2": "^0.1.4",
     "mocha": "^2.1.0",
     "mockery": "~1.4.0",
     "nock": "^7.2.2",
     "openvpn-client": "0.0.2",
     "requestmock": "0.0.9",
+    "resin-lint": "^1.2.1",
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0",
     "supertest": "~0.15.0"