Merge pull request #5006 from strapi/chore/test-scripts

Refactor tests and add codecov

.travis.yml

@@ -44,6 +44,7 @@ install_mongo: &install_mongo
 before_script:
   - yarn build
   - yarn global add -g wait-on
+  - yarn global add codecov
 
 jobs:
   include:
@@ -56,8 +57,8 @@ jobs:
       name: 'Lint / Unit Tests '
       script:
         - yarn run -s lint
-        - yarn run -s test:unit
+        - yarn run -s test:unit --coverage && codecov -C -F unit
-        - yarn run -s test:front
+        - yarn run -s test:front && codecov -C -F front
 
     - <<: *e2e_tests
       name: 'E2E Postgresql'

jest.config.e2e.js

@@ -1,6 +1,5 @@
 module.exports = {
-  name: 'setup',
+  name: 'API integration tests',
-  displayName: 'Setup',
   testMatch: ['**/?(*.)+(spec|test).e2e.js'],
   testEnvironment: 'node',
   coveragePathIgnorePatterns: [

jest.config.js

@@ -1,13 +1,5 @@
 module.exports = {
-  name: 'setup',
+  name: 'Unit test',
-  displayName: 'Setup',
+  testMatch: ['**/packages/**/__tests__/?(*.)+(spec|test).js'],
-  testMatch: ['**/test/?(*.)+(spec|test).js'],
-  testPathIgnorePatterns: ['<rootDir>/packages/'],
-  coveragePathIgnorePatterns: [
-    '<rootDir>/dist/',
-    '<rootDir>/node_modules/',
-    '<rootDir>/out-tsc/',
-    '<rootDir>/test/',
-  ],
   transform: {},
 };

package.json

@@ -49,7 +49,7 @@
     "test:front:watch": "cross-env NODE_ENV=test jest --config ./jest.config.front.js --watchAll",
     "test:front:update": "cross-env NODE_ENV=test jest --config ./jest.config.front.js --u",
     "test:snyk": "snyk test",
-    "test:unit": "lerna exec -- npm run test -s",
+    "test:unit": "jest --verbose",
     "test:e2e": "FORCE_COLOR=true jest --config jest.config.e2e.js --runInBand --verbose --forceExit --detectOpenHandles",
     "test:generate-app": "node test/createTestApp.js",
     "test:start-app": "node test/startTestApp.js"

packages/strapi-plugin-content-manager/package.json

@@ -8,9 +8,6 @@
     "description": "content-manager.plugin.description",
     "required": true
   },
-  "scripts": {
-    "test": "jest services"
-  },
   "dependencies": {
     "classnames": "^2.2.6",
     "codemirror": "^5.46.0",

packages/strapi-plugin-content-type-builder/jest.config.unit.js

@@ -1,3 +0,0 @@
-module.exports = {
-  testMatch: ['**/__tests__/?(*.)+(spec|test).js'],
-};

packages/strapi-plugin-content-type-builder/package.json

@@ -7,9 +7,6 @@
     "icon": "paint-brush",
     "description": "content-type-builder.plugin.description"
   },
-  "scripts": {
-    "test": "jest --verbose --config=jest.config.unit.js"
-  },
   "dependencies": {
     "@sindresorhus/slugify": "^0.9.1",
     "classnames": "^2.2.6",

packages/strapi-utils/package.json

@@ -14,9 +14,6 @@
     "lib": "./lib"
   },
   "main": "./lib",
-  "scripts": {
-    "test": "jest"
-  },
   "dependencies": {
     "date-fns": "^2.8.1",
     "knex": "^0.16.5",

packages/strapi/lib/core/__tests__/fs.test.js

@@ -1,6 +1,7 @@
 const fs = require('../fs');
+const fse = require('fs-extra');
+
 jest.mock('fs-extra');
-const fsExtra = require('fs-extra');
 
 describe('Strapi fs utils', () => {
   const strapi = {
@@ -22,8 +23,8 @@ describe('Strapi fs utils', () => {
 
       await strapiFS.writeAppFile('test', content);
 
-      expect(fsExtra.ensureFile).toHaveBeenCalledWith('/tmp/test');
+      expect(fse.ensureFile).toHaveBeenCalledWith('/tmp/test');
-      expect(fsExtra.writeFile).toHaveBeenCalledWith('/tmp/test', content);
+      expect(fse.writeFile).toHaveBeenCalledWith('/tmp/test', content);
     });
 
     test('Normalize the path to avoid relative access to folders in parent directories', async () => {
@@ -33,8 +34,8 @@ describe('Strapi fs utils', () => {
 
       await strapiFS.writeAppFile('../../test', content);
 
-      expect(fsExtra.ensureFile).toHaveBeenCalledWith('/tmp/test');
+      expect(fse.ensureFile).toHaveBeenCalledWith('/tmp/test');
-      expect(fsExtra.writeFile).toHaveBeenCalledWith('/tmp/test', content);
+      expect(fse.writeFile).toHaveBeenCalledWith('/tmp/test', content);
     });
 
     test('Works with array path', async () => {
@@ -44,11 +45,8 @@ describe('Strapi fs utils', () => {
 
       await strapiFS.writeAppFile(['test', 'sub', 'path'], content);
 
-      expect(fsExtra.ensureFile).toHaveBeenCalledWith('/tmp/test/sub/path');
+      expect(fse.ensureFile).toHaveBeenCalledWith('/tmp/test/sub/path');
-      expect(fsExtra.writeFile).toHaveBeenCalledWith(
+      expect(fse.writeFile).toHaveBeenCalledWith('/tmp/test/sub/path', content);
-        '/tmp/test/sub/path',
-        content
-      );
     });
   });
 

packages/strapi/package.json

@@ -61,7 +61,6 @@
     "strapi-utils": "3.0.0-beta.18.4"
   },
   "scripts": {
-    "test": "jest --verbose",
     "postinstall": "node lib/utils/success.js"
   },
   "author": {

scripts/publish.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Force start from root folder
 cd "$(dirname "$0")/.."
 
@@ -6,7 +8,7 @@ set -e
 version=""
 
 echo "Please enter the version you want to publish"
-read version
+read -r version
 
 # publish packages
 ./node_modules/.bin/lerna publish --no-push --dist-tag beta --exact "$version"