Skip to content

Fix lingui plural warning #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sleepycat merged 1 commit into from
Apr 15, 2020
Merged

Fix lingui plural warning #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions frontend/src/__tests__/App.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@ import gql from 'graphql-tag'
import { UserStateProvider } from '../UserState'
import App from '../App'
import { I18nProvider } from '@lingui/react'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

const resolvers = {
Query: {
Expand Down Expand Up @@ -69,7 +64,7 @@ describe('<App/>', () => {
initialState={{ userName: null, jwt: null, tfa: null }}
>
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<MemoryRouter initialEntries={['/']} initialIndex={0}>
<MockedProvider resolvers={resolvers} mocks={mocks}>
<App />
Expand All @@ -92,7 +87,7 @@ describe('<App/>', () => {
initialState={{ userName: null, jwt: null, tfa: null }}
>
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<MemoryRouter initialEntries={['/domains']} initialIndex={0}>
<MockedProvider
mocks={mocks}
Expand Down
13 changes: 4 additions & 9 deletions frontend/src/__tests__/CreateUserPage.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ import { MockedProvider } from '@apollo/react-testing'
import { CreateUserPage } from '../CreateUserPage'
import { CREATE_USER } from '../graphql/mutations'
import { I18nProvider } from '@lingui/react'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

const resolvers = {
Query: {
Expand Down Expand Up @@ -42,7 +37,7 @@ describe('<CreateUserPage />', () => {
it('displays an error message', async () => {
const { container, queryByText } = render(
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<MemoryRouter initialEntries={['/']} initialIndex={0}>
<MockedProvider mocks={mocks} resolvers={resolvers}>
<CreateUserPage />
Expand All @@ -68,7 +63,7 @@ describe('<CreateUserPage />', () => {
it('displays an error message', async () => {
const { container, queryByText } = render(
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<MemoryRouter initialEntries={['/']} initialIndex={0}>
<MockedProvider mocks={mocks} resolvers={resolvers}>
<CreateUserPage />
Expand Down Expand Up @@ -97,7 +92,7 @@ describe('<CreateUserPage />', () => {
it('displays an error message', async () => {
const { container, queryByText } = render(
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<MemoryRouter initialEntries={['/']} initialIndex={0}>
<MockedProvider mocks={mocks} resolvers={resolvers}>
<CreateUserPage />
Expand Down
11 changes: 3 additions & 8 deletions frontend/src/__tests__/DmarcReportPage.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ import { MockedProvider } from '@apollo/react-testing'
import { DmarcReportPage } from '../DmarcReportPage'
import { QUERY_DMARC_REPORT } from '../graphql/queries'
import { I18nProvider } from '@lingui/react'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

describe('<DmarcReportPage />', () => {
it('renders pass icons in sub-headers correctly', async () => {
Expand Down Expand Up @@ -65,7 +60,7 @@ describe('<DmarcReportPage />', () => {

const { getByRole } = render(
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<MemoryRouter initialEntries={['/']} initialIndex={0}>
<MockedProvider mocks={mocks} addTypename={false}>
<DmarcReportPage />
Expand Down Expand Up @@ -137,7 +132,7 @@ describe('<DmarcReportPage />', () => {

const { getByText, getByRole } = render(
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<MemoryRouter initialEntries={['/']} initialIndex={0}>
<MockedProvider mocks={mocks} addTypename={false}>
<DmarcReportPage />
Expand Down
9 changes: 2 additions & 7 deletions frontend/src/__tests__/EmailField.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ import { ThemeProvider, theme } from '@chakra-ui/core'
import { EmailField } from '../EmailField'
import { Formik } from 'formik'
import { I18nProvider } from '@lingui/react'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

describe('<EmailField />', () => {
describe('when validation fails', () => {
Expand All @@ -20,7 +15,7 @@ describe('<EmailField />', () => {
})

const { getByTestId, getByText } = render(
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<ThemeProvider theme={theme}>
<Formik
// return a sadness error for the password field
Expand Down
9 changes: 2 additions & 7 deletions frontend/src/__tests__/Footer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,15 @@ import { I18nProvider } from '@lingui/react'
import { ThemeProvider, theme } from '@chakra-ui/core'
import { Footer } from '../Footer'
import { render } from '@testing-library/react'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

describe('<Footer />', () => {
beforeEach(() => (global.scrollTo = jest.fn()))

it('renders children correctly', () => {
const { getAllByText } = render(
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<Footer>
<div>foo</div>
</Footer>
Expand Down
9 changes: 2 additions & 7 deletions frontend/src/__tests__/LandingPage.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ import { MemoryRouter } from 'react-router-dom'
import { ThemeProvider, theme } from '@chakra-ui/core'
import { LandingPage } from '../LandingPage'
import { I18nProvider } from '@lingui/react'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

describe('<LandingPage />', () => {
afterEach(cleanup)
Expand All @@ -18,7 +13,7 @@ describe('<LandingPage />', () => {
render(
<MemoryRouter initialEntries={['/']}>
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<LandingPage />
</I18nProvider>
</ThemeProvider>
Expand Down
11 changes: 3 additions & 8 deletions frontend/src/__tests__/PasswordConfirmation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ import { ThemeProvider, theme } from '@chakra-ui/core'
import { PasswordConfirmation } from '../PasswordConfirmation'
import { Formik } from 'formik'
import { I18nProvider } from '@lingui/react'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

describe('<PasswordConfirmation />', () => {
it('renders within a <Formik> wrapper', async () => {
Expand All @@ -20,7 +15,7 @@ describe('<PasswordConfirmation />', () => {
})

const { container } = render(
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<ThemeProvider theme={theme}>
<Formik
// return a sadness error for the password field
Expand All @@ -47,7 +42,7 @@ describe('<PasswordConfirmation />', () => {
})

const { getByRole } = render(
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<ThemeProvider theme={theme}>
<Formik
// return a sadness error for the password field
Expand Down
13 changes: 4 additions & 9 deletions frontend/src/__tests__/PasswordField.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ import { ThemeProvider, theme } from '@chakra-ui/core'
import { PasswordField } from '../PasswordField'
import { Formik } from 'formik'
import { I18nProvider } from '@lingui/react'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

describe('<PasswordField />', () => {
describe('when validation fails', () => {
Expand All @@ -19,7 +14,7 @@ describe('<PasswordField />', () => {
password: string().required('sadness'),
})
const { getByTestId, getByText } = render(
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<ThemeProvider theme={theme}>
<Formik
// return a sadness error for the password field
Expand All @@ -45,7 +40,7 @@ describe('<PasswordField />', () => {
describe('by default', () => {
it('renders a password field', async () => {
const { getByTestId } = render(
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<ThemeProvider theme={theme}>
<Formik
initialValues={{
Expand All @@ -69,7 +64,7 @@ describe('<PasswordField />', () => {
describe('when the hide button is clicked', () => {
it('renders a password field', async () => {
const { getByRole } = render(
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<ThemeProvider theme={theme}>
<Formik
initialValues={{
Expand Down
9 changes: 2 additions & 7 deletions frontend/src/__tests__/PhaseBanner.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,13 @@ import { ThemeProvider, theme } from '@chakra-ui/core'
import { render } from '@testing-library/react'
import { PhaseBanner } from '../PhaseBanner'
import { I18nProvider } from '@lingui/react'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

describe('<PhaseBanner />', () => {
it('properly renders alpha banner', async () => {
const { queryByText } = render(
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<PhaseBanner phase="ALPHA" />
</I18nProvider>
</ThemeProvider>,
Expand Down
9 changes: 2 additions & 7 deletions frontend/src/__tests__/QRcodePage.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@ import { I18nProvider } from '@lingui/react'
import { MockedProvider } from '@apollo/react-testing'
import { UserStateProvider } from '../UserState'
import { GENERATE_OTP_URL } from '../graphql/queries'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

const email = 'foo@example.com'
const resolvers = {
Expand Down Expand Up @@ -51,7 +46,7 @@ describe('<QRcodePage />', () => {
<MockedProvider mocks={mocks} resolvers={resolvers}>
<MemoryRouter initialEntries={['/']}>
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<QRcodePage />
</I18nProvider>
</ThemeProvider>
Expand Down
13 changes: 4 additions & 9 deletions frontend/src/__tests__/SignInPage.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ import { MockedProvider } from '@apollo/react-testing'
import gql from 'graphql-tag'
import { UserStateProvider } from '../UserState'
import App from '../App'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

const resolvers = {
Query: {
Expand Down Expand Up @@ -58,7 +53,7 @@ describe('<SignInPage />', () => {
initialState={{ userName: null, jwt: null, tfa: null }}
>
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<MemoryRouter initialEntries={['/']} initialIndex={0}>
<MockedProvider resolvers={resolvers} mocks={mocks}>
<SignInPage />
Expand Down Expand Up @@ -88,7 +83,7 @@ describe('<SignInPage />', () => {
initialState={{ userName: null, jwt: null, tfa: null }}
>
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<MemoryRouter initialEntries={['/']} initialIndex={0}>
<MockedProvider
resolvers={resolvers}
Expand Down Expand Up @@ -168,7 +163,7 @@ describe('<SignInPage />', () => {
initialState={{ userName: null, jwt: null, tfa: null }}
>
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<Router history={history}>
<MockedProvider
resolvers={resolvers}
Expand Down
13 changes: 3 additions & 10 deletions frontend/src/__tests__/TopBanner.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,20 @@ import { ThemeProvider, theme } from '@chakra-ui/core'
import { TopBanner } from '../TopBanner'
import { render, cleanup } from '@testing-library/react'
import { I18nProvider } from '@lingui/react'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

describe('<TopBanner />', () => {
afterEach(cleanup)

it('renders using the language prop correctly', () => {
const { getByRole } = render(
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<TopBanner lang="en" />
</I18nProvider>
</ThemeProvider>,
)
const test = getByRole('img')
expect(test.getAttribute('alt')).toBe(
'Symbol of the Government of Canada',
)
expect(test.getAttribute('alt')).toBe('Symbol of the Government of Canada')
})
})
9 changes: 2 additions & 7 deletions frontend/src/__tests__/TwoFactorNotificationBar.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,14 @@ import { ThemeProvider, theme } from '@chakra-ui/core'
import { I18nProvider } from '@lingui/react'
import { render } from '@testing-library/react'
import { TwoFactorNotificationBar } from '../TwoFactorNotificationBar'
import { i18n } from '@lingui/core'
import { en } from 'make-plural/plurals'

i18n.loadLocaleData('en', { plurals: en })
i18n.load('en', { en: {} })
i18n.activate('en')
import { setupI18n } from '@lingui/core'

describe('<TwoFactorNotificationBar />', () => {
// XXX: rework this test
it('successfully renders the component on its own.', () => {
render(
<ThemeProvider theme={theme}>
<I18nProvider i18n={i18n}>
<I18nProvider i18n={setupI18n()}>
<MemoryRouter initialEntries={['/']} initialIndex={0}>
<TwoFactorNotificationBar />
</MemoryRouter>
Expand Down
Loading