From f050378ee28be88ae1716061f6cf417883e28c4c Mon Sep 17 00:00:00 2001 From: Regina-Gimazova Date: Mon, 18 Jul 2022 16:13:48 +0300 Subject: [PATCH 1/2] Small fixes --- .semaphore/semaphore.yml | 2 +- components/shared/templates/DefaultTemplate/styled.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 7c9e8966..03041457 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -34,7 +34,7 @@ global_job_config: commands: - checkout - # restore cache for nvm, yarn and node_modeles + # restore cache for nvm, yarn and node_modules - cache restore - nvm use blocks: diff --git a/components/shared/templates/DefaultTemplate/styled.ts b/components/shared/templates/DefaultTemplate/styled.ts index 8c5c6c53..7d2df0ab 100644 --- a/components/shared/templates/DefaultTemplate/styled.ts +++ b/components/shared/templates/DefaultTemplate/styled.ts @@ -7,7 +7,7 @@ export const Wrapper = styled.div` align-items: center; `; -export const PageContent = styled.div( +export const PageContent = styled.main( ({ theme: { down, breakpoints } }) => css` padding: 2rem 1rem; From cf870df3cf4b0837530c2efc19b6abd866bb9c97 Mon Sep 17 00:00:00 2001 From: Regina-Gimazova Date: Mon, 25 Jul 2022 14:42:05 +0300 Subject: [PATCH 2/2] fix signup form test --- components/pages/signIn/components/SignInForm/styled.ts | 1 + .../pages/signUp/components/SignUpForm/SignUpForm.test.jsx | 4 ++-- components/pages/signUp/components/SignUpForm/SignUpForm.tsx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/pages/signIn/components/SignInForm/styled.ts b/components/pages/signIn/components/SignInForm/styled.ts index 4658fddd..70bbc328 100644 --- a/components/pages/signIn/components/SignInForm/styled.ts +++ b/components/pages/signIn/components/SignInForm/styled.ts @@ -2,6 +2,7 @@ import styled from 'styled-components'; export const FormContentWrapper = styled.div` width: 40rem; + max-width: 100%; `; export const FieldWrapper = styled.div` diff --git a/components/pages/signUp/components/SignUpForm/SignUpForm.test.jsx b/components/pages/signUp/components/SignUpForm/SignUpForm.test.jsx index 9b5fe85f..81a3e4c4 100644 --- a/components/pages/signUp/components/SignUpForm/SignUpForm.test.jsx +++ b/components/pages/signUp/components/SignUpForm/SignUpForm.test.jsx @@ -8,7 +8,7 @@ import SignUpForm from './SignUpForm'; jest.mock('lib/apollo/hooks/actions/useSignUp'); -describe('SignInForm', () => { +describe('SignUpForm', () => { let signUp; let signUpState; @@ -80,6 +80,6 @@ describe('SignInForm', () => { fireEvent.click(screen.getByTestId('submit-button')); // Assert - expect(screen.getByTestId('signin-loader')).toBeInTheDocument(); + expect(screen.getByTestId('signup-loader')).toBeInTheDocument(); }); }); diff --git a/components/pages/signUp/components/SignUpForm/SignUpForm.tsx b/components/pages/signUp/components/SignUpForm/SignUpForm.tsx index 1a5a7a8e..26454adf 100644 --- a/components/pages/signUp/components/SignUpForm/SignUpForm.tsx +++ b/components/pages/signUp/components/SignUpForm/SignUpForm.tsx @@ -71,7 +71,7 @@ const SignUpForm = () => { component={SignUpFormContent} validationSchema={SignUpValidationSchema} /> - {signUpResult.loading && Loading...} + {signUpResult.loading && Loading...} ); };