Skip to content
This repository was archived by the owner on Jul 18, 2022. It is now read-only.

Commit 837b6fe

Browse files
boonyaboonya
committed
All dependecies are up to date + jest.mocked instead of ts-jest mocked due to jestjs/jest#12089 
1 parent f7851f2 commit 837b6fe

17 files changed

Lines changed: 994 additions & 991 deletions

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.12
1+
16

‎package-lock.json‎

Lines changed: 918 additions & 912 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
},
3939
"devDependencies": {
4040
"@testing-library/react-hooks": "^7.0.2",
41-
"@types/jest": "^27.0.2",
42-
"@types/lodash": "^4.14.176",
43-
"@types/react": "^17.0.31",
44-
"@typescript-eslint/eslint-plugin": "^5.1.0",
45-
"@typescript-eslint/parser": "^5.1.0",
41+
"@types/jest": "^27.0.3",
42+
"@types/lodash": "^4.14.178",
43+
"@types/react": "^17.0.37",
44+
"@typescript-eslint/eslint-plugin": "^5.7.0",
45+
"@typescript-eslint/parser": "^5.7.0",
4646
"eslint": "^7.32.0",
47-
"eslint-plugin-react-hooks": "^4.2.0",
48-
"jest": "^27.3.1",
47+
"eslint-plugin-react-hooks": "^4.3.0",
48+
"jest": "^27.4.5",
4949
"react-test-renderer": "^17.0.2",
50-
"ts-jest": "^27.0.7",
51-
"typescript": "^4.4.4"
50+
"ts-jest": "^27.1.2",
51+
"typescript": "^4.5.4"
5252
}
5353
}

‎src/processor/processorCreator.test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {ValidationRuleSet, FormPayload, FieldState} from '../types';
22
import processorCreator from './processorCreator';
33
import calculateValidity from './validityCalculator';
4-
import {mocked} from 'ts-jest/utils';
54

65
jest.mock('./validityCalculator');
76

@@ -13,7 +12,7 @@ const validity: FieldState = {
1312
};
1413

1514
beforeEach(() => {
16-
mocked(calculateValidity).mockName('calculateValidity').mockResolvedValue(validity);
15+
jest.mocked(calculateValidity).mockName('calculateValidity').mockResolvedValue(validity);
1716
});
1817

1918
describe('Creates a processor function which retrieves a field rules and calculate validity of its payload.', () => {

‎src/processor/validityCalculator.test.ts‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import calculateValidity from './validityCalculator';
22
import validityReducerCreator from './validityReducerCreator';
3-
import {mocked} from 'ts-jest/utils';
43
import {FormPayload, VALIDATORS} from '../types';
54
import {extractFieldValue} from '../helpers';
65

@@ -13,11 +12,11 @@ const validityReducer = jest.fn().mockName('validityReducer');
1312

1413
beforeEach(() => {
1514
validityReducer.mockResolvedValue(null);
16-
mocked(validityReducerCreator).mockName('validityReducerCreator').mockReturnValue(validityReducer);
15+
jest.mocked(validityReducerCreator).mockName('validityReducerCreator').mockReturnValue(validityReducer);
1716
});
1817

1918
test('If no ruleset and no value (value=undefined) the function returns default field validity state.', async () => {
20-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(undefined);
19+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(undefined);
2120

2221
const result = await calculateValidity([], payload, FIELD._1, 0);
2322

@@ -54,42 +53,42 @@ describe('If there is a value but no ruleset the function returns default field
5453
}
5554

5655
test('If value is 0', async () => {
57-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(0);
56+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(0);
5857
await executeTest();
5958
});
6059

6160
test('If value is "0"', async () => {
62-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue('0');
61+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue('0');
6362
await executeTest();
6463
});
6564

6665
test('If value is null', async () => {
67-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(null);
66+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(null);
6867
await executeTest();
6968
});
7069

7170
test('If value is ""', async () => {
72-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue('');
71+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue('');
7372
await executeTest();
7473
});
7574

7675
test('If value is " "', async () => {
77-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(' ');
76+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(' ');
7877
await executeTest();
7978
});
8079

8180
test('If value is "\\n"', async () => {
82-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue('\n');
81+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue('\n');
8382
await executeTest();
8483
});
8584

8685
test('If value is an empty array', async () => {
87-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue([]);
86+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue([]);
8887
await executeTest();
8988
});
9089

9190
test('If value is an empty object', async () => {
92-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue({});
91+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue({});
9392
await executeTest();
9493
});
9594
});
@@ -98,7 +97,7 @@ test('If there is a single rule specified but a value and index are undefined.',
9897
const RULESET = [{validator: VALIDATORS.required}];
9998
const VALUE = undefined;
10099
const INDEX = 0;
101-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(VALUE);
100+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(VALUE);
102101

103102
const result = await calculateValidity(RULESET, payload, FIELD._1, INDEX);
104103

@@ -122,7 +121,7 @@ test('If there is a single rule specified + a value and index are defined.', asy
122121
const RULESET = [{validator: VALIDATORS.required}];
123122
const VALUE = 'a value';
124123
const INDEX = 2;
125-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(VALUE);
124+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(VALUE);
126125

127126
const result = await calculateValidity(RULESET, payload, FIELD._1, INDEX);
128127

@@ -146,7 +145,7 @@ test('If there is a several rules specified + a value and index are defined.', a
146145
const RULESET = [{validator: VALIDATORS.required}, {validator: VALIDATORS.min}, {validator: VALIDATORS.email}];
147146
const VALUE = 'a value';
148147
const INDEX = 2;
149-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(VALUE);
148+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(VALUE);
150149

151150
const result = await calculateValidity(RULESET, payload, FIELD._1, INDEX);
152151

@@ -179,7 +178,7 @@ test('If validityReducer returns new state.', async () => {
179178
error: true,
180179
message: 'an error',
181180
};
182-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(VALUE);
181+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(VALUE);
183182
validityReducer.mockResolvedValue(NEW_STATE);
184183

185184
const result = await calculateValidity(RULESET, payload, FIELD._1, INDEX);

‎src/processor/validityReducerCreator.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { FieldRule, FormPayload, FieldState, VALIDATORS } from '../types';
22
import validateValue from '../validators';
33
import { extractFieldValue } from '../helpers';
44
import validityReducerCreator from './validityReducerCreator';
5-
import { mocked } from 'ts-jest/utils';
5+
66

77
jest.mock('../validators');
88
jest.mock('../helpers');
@@ -13,8 +13,8 @@ const FIELDS = {
1313
};
1414

1515
beforeEach(() => {
16-
mocked(validateValue).mockName('validateValue').mockResolvedValue({ error: false, message: 'success' });
17-
mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(undefined);
16+
jest.mocked(validateValue).mockName('validateValue').mockResolvedValue({ error: false, message: 'success' });
17+
jest.mocked(extractFieldValue).mockName('extractFieldValue').mockReturnValue(undefined);
1818
});
1919

2020
const INDEX = 0;
@@ -27,7 +27,7 @@ describe('Check condition if passed', () => {
2727
test('Returns null if the condition is not met. Condition selector receives no args.', async () => {
2828
const conditionSelector = jest.fn(() => false).mockName('conditionSelector');
2929
const FIELD_RULE: FieldRule = { validator: VALIDATORS.required, condition: [conditionSelector] };
30-
mocked(validateValue).mockName('validateValue').mockResolvedValue({ error: true, message: 'fail' });
30+
jest.mocked(validateValue).mockName('validateValue').mockResolvedValue({ error: true, message: 'fail' });
3131

3232
const reducer = validityReducerCreator(PAYLOAD, FIELD, VALUE, INDEX);
3333
const result = await reducer(Promise.resolve(null), FIELD_RULE);
@@ -44,10 +44,10 @@ describe('Check condition if passed', () => {
4444
const conditionSelector = jest.fn(() => false).mockName('conditionSelector');
4545
const FIELD_NAMES = [FIELDS._1, FIELDS._1];
4646
const FIELD_RULE: FieldRule = { validator: VALIDATORS.required, condition: [conditionSelector, ...FIELD_NAMES] };
47-
mocked(extractFieldValue).mockName('extractFieldValue')
47+
jest.mocked(extractFieldValue).mockName('extractFieldValue')
4848
.mockReturnValueOnce(`${FIELDS._1} value`)
4949
.mockReturnValueOnce(`${FIELDS._2} value`);
50-
mocked(validateValue).mockName('validateValue').mockResolvedValue({ error: true, message: 'fail' });
50+
jest.mocked(validateValue).mockName('validateValue').mockResolvedValue({ error: true, message: 'fail' });
5151

5252
const reducer = validityReducerCreator(PAYLOAD, FIELD, VALUE, INDEX);
5353
const result = await reducer(Promise.resolve(null), FIELD_RULE);
@@ -66,7 +66,7 @@ describe('Check condition if passed', () => {
6666
const conditionSelector = jest.fn(() => true).mockName('conditionSelector');
6767
const FIELD_NAMES = [FIELDS._1, FIELDS._1];
6868
const FIELD_RULE: FieldRule = { validator: VALIDATORS.required, condition: [conditionSelector, ...FIELD_NAMES] };
69-
mocked(extractFieldValue).mockName('extractFieldValue')
69+
jest.mocked(extractFieldValue).mockName('extractFieldValue')
7070
.mockReturnValueOnce(`${FIELDS._1} value`)
7171
.mockReturnValueOnce(`${FIELDS._2} value`);
7272

@@ -106,7 +106,7 @@ describe('Returns FieldState object if validation produces any error.', () => {
106106

107107
async function executeTest(value: unknown) {
108108
const FIELD_RULE: FieldRule = { validator: VALIDATORS.required };
109-
mocked(validateValue).mockName('validateValue').mockResolvedValue({ error: true, message: 'fail' });
109+
jest.mocked(validateValue).mockName('validateValue').mockResolvedValue({ error: true, message: 'fail' });
110110

111111
const reducer = validityReducerCreator(PAYLOAD, FIELD, value, INDEX);
112112
const result = await reducer(Promise.resolve(null), FIELD_RULE);

‎src/useValidation.test.ts‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ import {
88
processFieldValidity,
99
validateRuleSet,
1010
} from './helpers';
11-
import { mocked } from 'ts-jest/utils';
1211
import { renderHook, act } from '@testing-library/react-hooks';
1312

1413
jest.mock('./processor');
1514
jest.mock('./helpers');
1615

1716
const validRuleSet: ValidationRuleSet = [{
18-
field: 'fieldname',
17+
field: 'field_name',
1918
rules: [{ validator: VALIDATORS.required }],
2019
}];
2120

@@ -36,11 +35,11 @@ const newValidity = new Validity([{
3635
const processor = jest.fn().mockName('processor');
3736

3837
beforeEach(() => {
39-
mocked(createProcessor).mockName('createProcessor').mockReturnValue(processor);
40-
mocked(createDefaultValidity).mockName('createDefaultValidity').mockReturnValue(defaultValidity);
41-
mocked(processFormValidity).mockName('processFormValidity').mockResolvedValue(newValidity);
42-
mocked(processFieldValidity).mockName('processFieldValidity').mockResolvedValue(newValidity);
43-
mocked(validateRuleSet).mockName('validateRuleSet').mockReturnValue();
38+
jest.mocked(createProcessor).mockName('createProcessor').mockReturnValue(processor);
39+
jest.mocked(createDefaultValidity).mockName('createDefaultValidity').mockReturnValue(defaultValidity);
40+
jest.mocked(processFormValidity).mockName('processFormValidity').mockResolvedValue(newValidity);
41+
jest.mocked(processFieldValidity).mockName('processFieldValidity').mockResolvedValue(newValidity);
42+
jest.mocked(validateRuleSet).mockName('validateRuleSet').mockReturnValue();
4443
});
4544

4645
function runHook() {
@@ -51,7 +50,7 @@ function runHook() {
5150

5251
describe('Hook throws an error', () => {
5352
test('no ruleset', () => {
54-
mocked(validateRuleSet).mockName('validateRuleSet').mockImplementation(() => {
53+
jest.mocked(validateRuleSet).mockName('validateRuleSet').mockImplementation(() => {
5554
throw new Error('RuleSet checker throws an error');
5655
});
5756
expect(() => useValidation([])).toThrow(new Error('RuleSet checker throws an error'));

‎src/validators/email.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import validateValue from './email';
22
import { createValidationMessage, createValidatorResult } from '../helpers';
33
import { VALIDATION_MESSAGES } from '../types';
4-
import { mocked } from 'ts-jest/utils';
4+
55

66
jest.mock('../helpers');
77

88
beforeEach(() => {
9-
mocked(createValidationMessage).mockName('createValidationMessage')
9+
jest.mocked(createValidationMessage).mockName('createValidationMessage')
1010
.mockImplementation((message) => message);
11-
mocked(createValidatorResult).mockName('createValidatorResult')
11+
jest.mocked(createValidatorResult).mockName('createValidatorResult')
1212
.mockImplementation((error) => ({ error, message: 'message' }));
1313
});
1414

‎src/validators/func.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import validateValue from './func';
22
import { createValidatorResult } from '../helpers';
3-
import { mocked } from 'ts-jest/utils';
3+
44

55
jest.mock('../helpers');
66

77
beforeEach(() => {
8-
mocked(createValidatorResult).mockName('createValidatorResult')
8+
jest.mocked(createValidatorResult).mockName('createValidatorResult')
99
.mockImplementation((error) => ({ error, message: 'message' }));
1010
});
1111

‎src/validators/index.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import aggregator from './index';
22
import { VALIDATORS } from '../types';
3-
import { mocked } from 'ts-jest/utils';
3+
44

55
import required from './required';
66
import min from './min';
@@ -25,15 +25,15 @@ jest.mock('./func');
2525
const validators = { required, min, max, email, url, postalCodeCA, sinCA, pattern, func };
2626

2727
beforeEach(() => {
28-
mocked(required).mockName(VALIDATORS.required).mockReturnValue(VALIDATORS.required);
29-
mocked(min).mockName(VALIDATORS.min).mockReturnValue(VALIDATORS.min);
30-
mocked(max).mockName(VALIDATORS.max).mockReturnValue(VALIDATORS.max);
31-
mocked(email).mockName(VALIDATORS.email).mockReturnValue(VALIDATORS.email);
32-
mocked(url).mockName(VALIDATORS.url).mockReturnValue(VALIDATORS.url);
33-
mocked(postalCodeCA).mockName(VALIDATORS.postalCodeCA).mockReturnValue(VALIDATORS.postalCodeCA);
34-
mocked(sinCA).mockName(VALIDATORS.sinCA).mockReturnValue(VALIDATORS.sinCA);
35-
mocked(pattern).mockName(VALIDATORS.pattern).mockReturnValue(VALIDATORS.pattern);
36-
mocked(func).mockName(VALIDATORS.func).mockResolvedValue(VALIDATORS.func);
28+
jest.mocked(required).mockName(VALIDATORS.required).mockReturnValue(VALIDATORS.required);
29+
jest.mocked(min).mockName(VALIDATORS.min).mockReturnValue(VALIDATORS.min);
30+
jest.mocked(max).mockName(VALIDATORS.max).mockReturnValue(VALIDATORS.max);
31+
jest.mocked(email).mockName(VALIDATORS.email).mockReturnValue(VALIDATORS.email);
32+
jest.mocked(url).mockName(VALIDATORS.url).mockReturnValue(VALIDATORS.url);
33+
jest.mocked(postalCodeCA).mockName(VALIDATORS.postalCodeCA).mockReturnValue(VALIDATORS.postalCodeCA);
34+
jest.mocked(sinCA).mockName(VALIDATORS.sinCA).mockReturnValue(VALIDATORS.sinCA);
35+
jest.mocked(pattern).mockName(VALIDATORS.pattern).mockReturnValue(VALIDATORS.pattern);
36+
jest.mocked(func).mockName(VALIDATORS.func).mockResolvedValue(VALIDATORS.func);
3737
});
3838

3939
Object.values(VALIDATORS).forEach((name) => {

0 commit comments

Comments
 (0)
⚡