Simplify YARN commands

.gitlab-ci.yml

@@ -22,7 +22,7 @@ before_script:
 
 lint-js:
   stage: lint
-  script: yarn test:lint:js
+  script: yarn lint:js
   only:
     changes:
       - "**/*.js"
@@ -34,7 +34,7 @@ lint-js:
 
 lint-sass:
   stage: lint
-  script: yarn test:lint:sass
+  script: yarn lint:sass
   only:
     changes:
       - "**/*.scss"
@@ -43,7 +43,7 @@ lint-sass:
 
 jest:
   stage: test
-  script: yarn test:jest
+  script: yarn test:coverage
   only:
     changes:
       - "**/*.js"

README.md

@@ -153,15 +153,15 @@ NODE_ENV=development
 - `yarn manage:translations` - Normalizes translation files. Should always be run after editing i18n strings.
 
 #### Tests
-- `yarn test` - Runs all tests.
+- `yarn test:all` - Runs all tests and linters.
 
-- `yarn test:lint` - Runs all linter tests.
+- `yarn test` - Runs Jest for frontend unit tests.
 
-- `yarn test:lint:js` - Runs only JavaScript linter.
+- `yarn lint` - Runs all linters.
 
-- `yarn test:lint:sass` - Runs only SASS linter.
+- `yarn lint:js` - Runs only JavaScript linter.
 
-- `yarn test:jest` - Frontend unit tests.
+- `yarn lint:sass` - Runs only SASS linter.
 
 # Contributing
 

docs/development/yarn-commands.md

@@ -18,12 +18,12 @@ NODE_ENV=development
 - `yarn manage:translations` - Normalizes translation files. Should always be run after editing i18n strings.
 
 ## Tests
-- `yarn test` - Runs all tests.
+- `yarn test:all` - Runs all tests and linters.
 
-- `yarn test:lint` - Runs all linter tests.
+- `yarn test` - Runs Jest for frontend unit tests.
 
-- `yarn test:lint:js` - Runs only JavaScript linter.
+- `yarn lint` - Runs all linters.
 
-- `yarn test:lint:sass` - Runs only SASS linter.
+- `yarn lint:js` - Runs only JavaScript linter.
 
-- `yarn test:jest` - Frontend unit tests.
+- `yarn lint:sass` - Runs only SASS linter.

package.json

@@ -21,11 +21,12 @@
     "build": "npx webpack",
     "jsdoc": "npx jsdoc -c jsdoc.conf.js",
     "manage:translations": "node ./webpack/translationRunner.js",
-    "test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest",
+    "test": "npx jest",
-    "test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
+    "test:coverage": "npx jest --coverage",
-    "test:lint:js": "npx eslint --ext .js,.jsx,.ts,.tsx . --cache",
+    "test:all": "${npm_execpath} run test:coverage && ${npm_execpath} run lint",
-    "test:lint:sass": "npx stylelint app/styles/**/*.scss",
+    "lint": "${npm_execpath} run lint:js && ${npm_execpath} run lint:sass",
-    "test:jest": "npx jest --coverage",
+    "lint:js": "npx eslint --ext .js,.jsx,.ts,.tsx . --cache",
+    "lint:sass": "npx stylelint app/styles/**/*.scss",
     "prepare": "husky install"
   },
   "license": "AGPL-3.0-or-later",