refactor(scripts): combine lint and test scripts (#64)

luftywiranda13 · Jan 17, 2018 · 7eee56f · 7eee56f
1 parent 7178520
commit 7eee56f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ node_js:
   - '8'
   - '6'
 script:
-  - npm run lint
   - node node_modules/.bin/prettier -l "*.{js,json,md}"
   - npm test
 after_success:

diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -16,9 +16,8 @@
     "precommit": "remove-lockfiles<% if (prettier) { %> && xo --fix && lint-staged<% } %>",<% if (esnext) { %>
     "prebuild": "rimraf dist",
     "build": "babel src --out-dir dist --copy-files --ignore *.test.js",<% } %>
-    "lint": "xo",
     "test:watch": "jest --watch",
-    "test": "jest<% if (coverage) { %> --coverage<% } %>"
+    "test": "xo && jest<% if (coverage) { %> --coverage<% } %>"
   },<% if (esnext) { %>
   "main": "dist/index.js",<% } %>
   "files": [

diff --git a/app/templates/_travis.yml b/app/templates/_travis.yml
@@ -4,8 +4,7 @@ notifications:
 node_js:
   - '8'
   - '6'
-script:
-  - npm run lint<% if (prettier) { %>
+script:<% if (prettier) { %>
   - node node_modules/.bin/prettier -l "*.{js,json,md}"<% } %>
   - npm test<% if (esnext) { %>
   - npm run build<% } %><% if (coverage) { %>

diff --git a/package.json b/package.json
@@ -14,10 +14,9 @@
     "node": ">=6"
   },
   "scripts": {
-    "lint": "xo",
     "precommit": "remove-lockfiles && xo --fix && lint-staged",
     "test:watch": "jest --watch",
-    "test": "jest --coverage"
+    "test": "xo && jest --coverage"
   },
   "files": [
     "app"

diff --git a/test.js b/test.js
@@ -141,7 +141,7 @@ describe('prompts', () => {
         .then(() => {
           assert.jsonFileContent('package.json', {
             scripts: {
-              test: 'jest --coverage',
+              test: 'xo && jest --coverage',
             },
           });