Skip to content

Commit b8fcd53

Browse files
author
n.knyazev
committed
fix: обновление зависимостей
1 parent ccc0d03 commit b8fcd53

38 files changed

Lines changed: 7160 additions & 5220 deletions

‎.storybook/main.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module.exports = {
2-
"stories": [
3-
"../src/components/**/*.stories.mdx",
4-
"../src/components/**/*.stories.ts",
5-
"../src/components/**/*.stories.@(js|jsx|ts|tsx)"
2+
stories: [
3+
'../src/components/**/*.stories.mdx',
4+
'../src/components/**/*.stories.ts',
5+
'../src/components/**/*.stories.@(js|jsx|ts|tsx)',
66
],
7-
"addons": [
8-
"@storybook/addon-links",
9-
"@storybook/addon-essentials",
10-
"@storybook/addon-interactions",
11-
"@storybook/preset-create-react-app"
7+
addons: [
8+
'@storybook/addon-links',
9+
'@storybook/addon-essentials',
10+
'@storybook/addon-interactions',
11+
'@storybook/preset-create-react-app',
1212
],
13-
"framework": "@storybook/react",
14-
"core": {
15-
"builder": "@storybook/builder-webpack5"
16-
}
17-
}
13+
framework: '@storybook/react',
14+
core: {
15+
builder: '@storybook/builder-webpack5',
16+
},
17+
};

‎.storybook/preview.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
21
import '../src/styles/styles.css';
32
import './styles.css';
43

54
export const parameters = {
6-
actions: { argTypesRegex: "^on[A-Z].*" },
5+
actions: { argTypesRegex: '^on[A-Z].*' },
76
controls: {
87
matchers: {
98
color: /(background|color)$/i,
109
date: /Date$/,
1110
},
1211
},
13-
}
12+
};

‎.storybook/styles.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
html {
2-
background-color: #ECEBEB;
2+
background-color: #ecebeb;
33
}

‎jest.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @type {import('jest').Config} */
22
const config = {
3-
testEnvironment: "node",
3+
testEnvironment: 'node',
44
};
55

66
module.exports = config;

‎package.json‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@testing-library/jest-dom": "^5.14.1",
7-
"@testing-library/react": "^13.0.0",
8-
"@testing-library/user-event": "^13.2.1",
6+
"@testing-library/jest-dom": "^6.9.1",
7+
"@testing-library/react": "^16.3.2",
8+
"@testing-library/user-event": "^14.6.1",
99
"@types/node": "^16.7.13",
10-
"@types/react": "^18.0.0",
11-
"@types/react-dom": "^18.0.0",
10+
"@types/react": "^18.3.1",
11+
"@types/react-dom": "^18.3.1",
1212
"classnames": "^2.3.1",
13-
"react": "^18.2.0",
14-
"react-dom": "^18.2.0",
13+
"react": "^18.3.1",
14+
"react-dom": "^18.3.1",
1515
"react-scripts": "5.0.1",
16-
"typescript": "^4.4.2",
17-
"web-vitals": "^2.1.0"
16+
"typescript": "^4.9.5"
1817
},
1918
"scripts": {
2019
"start": "react-scripts start",
@@ -28,7 +27,10 @@
2827
"jest": {
2928
"moduleNameMapper": {
3029
"\\.(css|less|scss)$": "identity-obj-proxy",
31-
"^.+\\.svg$": "jest-svg-transformer"
30+
"^.+\\.svg$": "jest-svg-transformer",
31+
"^puppeteer-core/internal/puppeteer-core\\.js$": "<rootDir>/node_modules/puppeteer-core/lib/cjs/puppeteer/puppeteer-core.js",
32+
"^puppeteer-core/internal/node/PuppeteerNode\\.js$": "<rootDir>/node_modules/puppeteer-core/lib/cjs/puppeteer/node/PuppeteerNode.js",
33+
"^puppeteer-core/internal/revisions\\.js$": "<rootDir>/node_modules/puppeteer-core/lib/cjs/puppeteer/revisions.js"
3234
}
3335
},
3436
"eslintConfig": {
@@ -74,24 +76,21 @@
7476
"@storybook/preset-create-react-app": "^4.1.2",
7577
"@storybook/react": "^6.5.10",
7678
"@storybook/testing-library": "^0.0.13",
77-
"@types/jest": "^29.4.0",
78-
"@types/jest-image-snapshot": "^6.1.0",
79-
"@types/js-yaml": "^4.0.5",
80-
"@types/serve-handler": "^6.1.1",
81-
"babel-plugin-named-exports-order": "^0.0.2",
82-
"jest": "^29.4.1",
83-
"jest-dev-server": "6.2.0",
84-
"jest-environment-jsdom": "^29.4.1",
85-
"jest-image-snapshot": "^6.1.0",
79+
"@types/jest": "^30.0.0",
80+
"@types/jest-image-snapshot": "^6.4.1",
81+
"@types/serve-handler": "^6.1.4",
82+
"jest": "^30.2.0",
83+
"jest-dev-server": "^11.0.0",
84+
"jest-environment-jsdom": "^30.2.0",
85+
"jest-image-snapshot": "^6.5.1",
8686
"jest-svg-transformer": "^1.0.0",
87-
"prop-types": "^15.8.1",
8887
"puppeteer": "^19.6.2",
8988
"sass": "^1.54.3",
9089
"serve-handler": "6.1.5",
91-
"webpack": "^5.74.0"
92-
},
93-
"resolutions": {
94-
"jest": "29.4.1",
95-
"jest-environment-jsdom": "29.4.1"
90+
"webpack": "^5.74.0",
91+
"resolutions": {
92+
"jest": "29.4.1",
93+
"jest-environment-jsdom": "29.4.1"
94+
}
9695
}
9796
}

‎src/__test__/Button.test.tsx‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ describe('Тестирование компонента Button', () => {
6767
expect(buttonElement).not.toBeDisabled();
6868
});
6969

70-
test('При передаче loading=true при клике на кнопку onClick не вызывается', () => {
70+
test('При передаче loading=true при клике на кнопку onClick не вызывается', async () => {
7171
const mockOnClick = jest.fn();
7272
render(
7373
<Button data-testid={Locators.BUTTON} onClick={mockOnClick} loading>
@@ -76,12 +76,12 @@ describe('Тестирование компонента Button', () => {
7676
);
7777

7878
const buttonElement = screen.getByTestId(Locators.BUTTON);
79-
userEvent.click(buttonElement);
79+
await userEvent.click(buttonElement);
8080

81-
expect(mockOnClick).not.toBeCalled();
81+
expect(mockOnClick).not.toHaveBeenCalled();
8282
});
8383

84-
test('Переданный onClick вызывается при клике', () => {
84+
test('Переданный onClick вызывается при клике', async () => {
8585
const mockOnClick = jest.fn();
8686
render(
8787
<Button onClick={mockOnClick} data-testid={Locators.BUTTON}>
@@ -90,12 +90,12 @@ describe('Тестирование компонента Button', () => {
9090
);
9191

9292
const buttonElement = screen.getByTestId(Locators.BUTTON);
93-
userEvent.click(buttonElement);
93+
await userEvent.click(buttonElement);
9494

95-
expect(mockOnClick).toBeCalledTimes(1);
95+
expect(mockOnClick).toHaveBeenCalledTimes(1);
9696
});
9797

98-
test('При disabled=true не вызывается onClick', () => {
98+
test('При disabled=true не вызывается onClick', async () => {
9999
const mockOnClick = jest.fn();
100100
const { rerender } = render(
101101
<Button data-testid={Locators.BUTTON} onClick={mockOnClick} disabled>
@@ -104,18 +104,18 @@ describe('Тестирование компонента Button', () => {
104104
);
105105

106106
const buttonElement = screen.getByTestId(Locators.BUTTON);
107-
userEvent.click(buttonElement);
107+
await userEvent.click(buttonElement);
108108

109-
expect(mockOnClick).not.toBeCalled();
109+
expect(mockOnClick).not.toHaveBeenCalled();
110110

111111
rerender(
112112
<Button data-testid={Locators.BUTTON} onClick={mockOnClick}>
113113
{BUTTON_TEXT}
114114
</Button>
115115
);
116-
userEvent.click(buttonElement);
116+
await userEvent.click(buttonElement);
117117

118-
expect(mockOnClick).toBeCalledTimes(1);
118+
expect(mockOnClick).toHaveBeenCalledTimes(1);
119119
});
120120

121121
test('При disabled=true проставляется атрибут disabled=true у кнопки', () => {
@@ -147,7 +147,7 @@ describe('Тестирование компонента Button', () => {
147147
expect(buttonElement).toHaveClass(testClassName);
148148
});
149149

150-
test('Пробрасываются все пропсы, которые принимает нативная кнопка', () => {
150+
test('Пробрасываются все пропсы, которые принимает нативная кнопка', async () => {
151151
const onHover = jest.fn();
152152
const onUnHover = jest.fn();
153153
const onFocus = jest.fn();
@@ -173,17 +173,17 @@ describe('Тестирование компонента Button', () => {
173173

174174
const buttonElement = screen.getByTestId(Locators.BUTTON);
175175

176-
userEvent.hover(buttonElement);
177-
expect(onHover).toBeCalledTimes(1);
176+
await userEvent.hover(buttonElement);
177+
expect(onHover).toHaveBeenCalledTimes(1);
178178

179-
userEvent.unhover(buttonElement);
180-
expect(onUnHover).toBeCalledTimes(1);
179+
await userEvent.unhover(buttonElement);
180+
expect(onUnHover).toHaveBeenCalledTimes(1);
181181

182-
userEvent.tab();
183-
expect(onFocus).toBeCalledTimes(1);
182+
await userEvent.tab();
183+
expect(onFocus).toHaveBeenCalledTimes(1);
184184

185-
userEvent.tab();
186-
expect(onBlur).toBeCalledTimes(1);
185+
await userEvent.tab();
186+
expect(onBlur).toHaveBeenCalledTimes(1);
187187

188188
expect(buttonElement).toHaveAttribute('id', id);
189189
expect(buttonElement).toHaveAttribute('name', name);

‎src/__test__/Card.test.tsx‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('Тестирование компонента Card', () => {
2020
test('Пропс title в виде элемента передается и отображается', () => {
2121
render(
2222
<Card
23-
// @ts-ignore
23+
// @ts-ignore
2424
title={<span data-testid={Locators.CARD_TITLE} />}
2525
subtitle={CARD_SUBTITLE}
2626
image="--"
@@ -65,7 +65,7 @@ describe('Тестирование компонента Card', () => {
6565
);
6666

6767
// eslint-disable-next-line testing-library/no-node-access
68-
const imageElement = baseElement.querySelector('img')
68+
const imageElement = baseElement.querySelector('img');
6969

7070
expect(imageElement).toHaveAttribute('src', testImageSrc);
7171
});
@@ -87,25 +87,23 @@ describe('Тестирование компонента Card', () => {
8787
expect(content).not.toBeInTheDocument();
8888
});
8989

90-
test('При клике вызывается onClick, если передан', () => {
90+
test('При клике вызывается onClick, если передан', async () => {
9191
const mockOnClick = jest.fn();
92-
const { container} = render(
93-
94-
<Card
95-
onClick={mockOnClick}
96-
title={CARD_TITLE}
97-
subtitle={CARD_SUBTITLE}
98-
image="-"
99-
/>
100-
92+
const { container } = render(
93+
<Card
94+
onClick={mockOnClick}
95+
title={CARD_TITLE}
96+
subtitle={CARD_SUBTITLE}
97+
image="-"
98+
/>
10199
);
102100

103101
// eslint-disable-next-line testing-library/no-node-access
104102
const cardElement = container.firstChild;
105103

106104
expect(cardElement).toBeInTheDocument();
107-
userEvent.click(cardElement as Element);
108-
expect(mockOnClick).toBeCalledTimes(1);
105+
await userEvent.click(cardElement as Element);
106+
expect(mockOnClick).toHaveBeenCalledTimes(1);
109107
});
110108

111109
test('Пропс actionSlot передаются и отображается', () => {
@@ -126,13 +124,7 @@ describe('Тестирование компонента Card', () => {
126124
});
127125

128126
test('Для title и subtitle используется компонент Text', () => {
129-
render(
130-
<Card
131-
image="-"
132-
title={CARD_TITLE}
133-
subtitle={CARD_SUBTITLE}
134-
/>
135-
);
127+
render(<Card image="-" title={CARD_TITLE} subtitle={CARD_SUBTITLE} />);
136128

137129
const texts = screen.getAllByTestId(Locators.TEXT);
138130
expect(texts.length).toBe(2);

‎src/__test__/CheckBox.test.tsx‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('Тестирование компонента CheckBox', () => {
2828
expect(checkBoxElement).not.toHaveAttribute('checked', 'false');
2929
});
3030

31-
test('При клике на чекбокс вызывается onChange со значением', () => {
31+
test('При клике на чекбокс вызывается onChange со значением', async () => {
3232
const mockOnChange = jest.fn();
3333
const { rerender } = render(
3434
<CheckBox
@@ -40,8 +40,8 @@ describe('Тестирование компонента CheckBox', () => {
4040

4141
const checkBoxElement = screen.getByTestId(Locators.CHECKBOX);
4242

43-
userEvent.click(checkBoxElement);
44-
expect(mockOnChange).toBeCalledWith(false);
43+
await userEvent.click(checkBoxElement);
44+
expect(mockOnChange).toHaveBeenCalledWith(false);
4545

4646
rerender(
4747
<CheckBox
@@ -51,20 +51,26 @@ describe('Тестирование компонента CheckBox', () => {
5151
/>
5252
);
5353

54-
userEvent.click(checkBoxElement);
55-
expect(mockOnChange).toBeCalledWith(true);
54+
await userEvent.click(checkBoxElement);
55+
expect(mockOnChange).toHaveBeenCalledWith(true);
5656
});
5757

5858
test('Компонент CheckBox использует html-тег input', () => {
59-
render(<CheckBox checked={true} onChange={() => {}} data-testid={Locators.CHECKBOX} />);
59+
render(
60+
<CheckBox
61+
checked={true}
62+
onChange={() => {}}
63+
data-testid={Locators.CHECKBOX}
64+
/>
65+
);
6066

6167
const inputElement = screen.getByTestId(Locators.CHECKBOX);
6268

6369
expect(inputElement.tagName).toBe('INPUT');
6470
expect(inputElement).toHaveAttribute('type', 'checkbox');
6571
});
6672

67-
test('При передаче disabled=true не вызывается onChange', () => {
73+
test('При передаче disabled=true не вызывается onChange', async () => {
6874
const mockOnChange = jest.fn();
6975
const { rerender } = render(
7076
<CheckBox
@@ -77,8 +83,8 @@ describe('Тестирование компонента CheckBox', () => {
7783

7884
const checkBoxElement = screen.getByTestId(Locators.CHECKBOX);
7985

80-
userEvent.click(checkBoxElement);
81-
expect(mockOnChange).not.toBeCalled();
86+
await userEvent.click(checkBoxElement);
87+
expect(mockOnChange).not.toHaveBeenCalled();
8288

8389
rerender(
8490
<CheckBox
@@ -88,8 +94,8 @@ describe('Тестирование компонента CheckBox', () => {
8894
/>
8995
);
9096

91-
userEvent.click(checkBoxElement);
92-
expect(mockOnChange).toBeCalled();
97+
await userEvent.click(checkBoxElement);
98+
expect(mockOnChange).toHaveBeenCalled();
9399
});
94100

95101
test('При передаче disabled проставляется атрибут disabled на чекбоксе', () => {

0 commit comments

Comments
 (0)