Skip to content

Commit e428a80

Browse files
authored
Merge pull request #186 from vidavidorra/test/ava
test/ava
2 parents f654e91 + acbb2c9 commit e428a80

13 files changed

+3569
-6609
lines changed

.eslintrc.js

+1-26
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,6 @@ const defaultConfig = {
99
node: true,
1010
},
1111
rules: {
12-
'no-restricted-globals': [
13-
'error',
14-
/**
15-
* From Jest global environment.
16-
* https://github.com/facebook/jest/blob/v26.4.2/packages/jest-globals/src/index.ts#L12-L27
17-
*/
18-
'jest',
19-
'expect',
20-
'it',
21-
'test',
22-
'fit',
23-
'xit',
24-
'xtest',
25-
'describe',
26-
'xdescribe',
27-
'fdescribe',
28-
'beforeAll',
29-
'beforeEach',
30-
'afterEach',
31-
'afterAll',
32-
],
3312
'prettier/prettier': 'error',
3413
'sort-imports': 'error',
3514
},
@@ -65,13 +44,9 @@ const config = defaultConfig;
6544
config.overrides = [
6645
{
6746
files: ['**/*.ts', '**/*.tsx'],
68-
extends: addToDefaultExtends(
69-
'plugin:@typescript-eslint/recommended',
70-
'plugin:jest/style',
71-
),
47+
extends: addToDefaultExtends('plugin:@typescript-eslint/recommended'),
7248
parser: '@typescript-eslint/parser',
7349
plugins: defaultConfig.plugins.concat(['@typescript-eslint']),
74-
rules: { ...defaultConfig.rules, 'jest/consistent-test-it': 'error' },
7550
},
7651
{
7752
files: ['**/*.json'],

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Install project
5959
run: npm ci --ignore-scripts
6060
- name: Test
61-
run: npm run test:ci
61+
run: npm test
6262
code-coverage:
6363
needs: [lint, build, test]
6464
runs-on: ubuntu-latest
@@ -73,7 +73,7 @@ jobs:
7373
- name: Install project
7474
run: npm ci --ignore-scripts
7575
- name: Test
76-
run: npm run test:ci
76+
run: npm test
7777
- name: Upload coverage to Codecov
7878
uses: codecov/codecov-action@e3c560433a6cc60aec8812599b7844a7b4fa0d71 # tag=v3.0.0
7979
with:

.lintstagedrc.js

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ module.exports = {
22
'*.{ts,tsx,js,jsx,json}': [
33
'npm run format:file',
44
'npm run lint-es:file:fix',
5-
() => 'npm run build:check',
65
() => 'npm run test',
76
],
87
'*.{vue,css,less,scss,html,htm,md,markdown,yml,yaml}': [

jest.config.js

-8
This file was deleted.

0 commit comments

Comments
 (0)