From b33a5ee91ab2e153922256bf21fbb4f791e9574c Mon Sep 17 00:00:00 2001 From: neko Date: Wed, 14 Sep 2022 16:35:05 +0300 Subject: [PATCH] final ref hw3 / fix text --- src/s2-homeworks/hw03/Greeting.tsx | 2 +- src/s2-homeworks/hw03/GreetingContainer.tsx | 4 ++-- src/s2-homeworks/hw03/tests/pureAddUser.test.tsx | 4 ++-- src/s2-homeworks/hw03/tests/pureOnBlur.test.tsx | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/s2-homeworks/hw03/Greeting.tsx b/src/s2-homeworks/hw03/Greeting.tsx index d17977b..e10a493 100644 --- a/src/s2-homeworks/hw03/Greeting.tsx +++ b/src/s2-homeworks/hw03/Greeting.tsx @@ -63,7 +63,7 @@ const Greeting: React.FC = ( {lastUserName && (
- hello {lastUserName}! + Привет {lastUserName}!
)} diff --git a/src/s2-homeworks/hw03/GreetingContainer.tsx b/src/s2-homeworks/hw03/GreetingContainer.tsx index 306b28d..ec3194f 100644 --- a/src/s2-homeworks/hw03/GreetingContainer.tsx +++ b/src/s2-homeworks/hw03/GreetingContainer.tsx @@ -10,7 +10,7 @@ type GreetingContainerPropsType = { export const pureAddUser = (name: any, setError: any, setName: any, addUserCallback: any) => { // если имя пустое - показать ошибку, иначе - добавить юзера и очистить инпут if (!name.trim()) { - setError('name is required!') + setError('Ошибка! Введите имя!') } else { addUserCallback(name) setName('') @@ -19,7 +19,7 @@ export const pureAddUser = (name: any, setError: any, setName: any, addUserCallb export const pureOnBlur = (name: any, setError: any) => { // если имя пустое - показать ошибку if (!name.trim()) { - setError('name is required!') + setError('Ошибка! Введите имя!') } } diff --git a/src/s2-homeworks/hw03/tests/pureAddUser.test.tsx b/src/s2-homeworks/hw03/tests/pureAddUser.test.tsx index e49d5c2..b9faa1b 100644 --- a/src/s2-homeworks/hw03/tests/pureAddUser.test.tsx +++ b/src/s2-homeworks/hw03/tests/pureAddUser.test.tsx @@ -31,13 +31,13 @@ test('name 2', () => { name = '' pureAddUser(name, setError, setName, addUserCallback) expect(name).toBe('') - expect(error).toBe('name is required!') + expect(error).toBe('Ошибка! Введите имя!') expect(added).toBe(false) }) test('name 3', () => { name = ' ' pureAddUser(name, setError, setName, addUserCallback) expect(name).toBe(' ') - expect(error).toBe('name is required!') + expect(error).toBe('Ошибка! Введите имя!') expect(added).toBe(false) }) diff --git a/src/s2-homeworks/hw03/tests/pureOnBlur.test.tsx b/src/s2-homeworks/hw03/tests/pureOnBlur.test.tsx index 6007fb1..cdce72c 100644 --- a/src/s2-homeworks/hw03/tests/pureOnBlur.test.tsx +++ b/src/s2-homeworks/hw03/tests/pureOnBlur.test.tsx @@ -20,10 +20,10 @@ test('name 1', () => { test('name 2', () => { name = '' pureOnBlur(name, setError) - expect(error).toBe('name is required!') + expect(error).toBe('Ошибка! Введите имя!') }) test('name 3', () => { name = ' ' pureOnBlur(name, setError) - expect(error).toBe('name is required!') + expect(error).toBe('Ошибка! Введите имя!') })