Skip to content

Commit

Permalink
Remove retranslate
Browse files Browse the repository at this point in the history
  • Loading branch information
mats-johanson committed Feb 15, 2022
1 parent e431c93 commit b67cdc0
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 40 deletions.
11 changes: 0 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"redux": "^4.1.2",
"redux-form": "^8.3.7",
"redux-thunk": "^2.4.0",
"retranslate": "^1.2.0",
"sass": "^1.43.4",
"typescript": "^4.4.4",
"uuid": "^3.3.3"
Expand Down
2 changes: 0 additions & 2 deletions src/components/account/AccountPageView.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ import {
applicationsBackend,
} from '../../test/backend';

jest.unmock('retranslate');

const server = setupServer();
let history: History;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {
} from '../../../test/backend';

jest.mock('downloadjs');
jest.unmock('retranslate');

describe('When a user is cancelling an application', () => {
const server = setupServer();
Expand Down
2 changes: 0 additions & 2 deletions src/components/flows/secondPillar/SecondPillarFlow.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ import {
smartIdSigningBackend,
} from '../../../test/backend';

jest.unmock('retranslate');

const server = setupServer();
let history: History;

Expand Down
1 change: 0 additions & 1 deletion src/components/login/LoginPage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import {
idCardAuthenticationBackend,
} from '../../test/backend';

jest.unmock('retranslate');
jest.unmock('react-intl');

describe('When a user is logging in', () => {
Expand Down
19 changes: 8 additions & 11 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { createBrowserHistory } from 'history';
import { createStore, compose, applyMiddleware } from 'redux';
import thunk from 'redux-thunk';
import { IntlProvider } from 'react-intl';
import { Provider as TranslationProvider } from 'retranslate';
import { Provider as ReduxProvider } from 'react-redux';
import { Switch, Route } from 'react-router-dom';
import { routerMiddleware, ConnectedRouter } from 'connected-react-router';
Expand Down Expand Up @@ -99,16 +98,14 @@ export class App extends Component {
return (
<QueryClientProvider client={queryClient}>
<IntlProvider messages={translations[locale]} locale={locale} defaultLocale="et">
<TranslationProvider messages={translations} language={locale} fallbackLanguage="et">
<ReduxProvider store={store}>
<ConnectedRouter history={history}>
<Switch>
<Route path={loginPath} component={LoginPage} />
<PrivateRoute exact path="" component={LoggedInApp} />
</Switch>
</ConnectedRouter>
</ReduxProvider>
</TranslationProvider>
<ReduxProvider store={store}>
<ConnectedRouter history={history}>
<Switch>
<Route path={loginPath} component={LoginPage} />
<PrivateRoute exact path="" component={LoggedInApp} />
</Switch>
</ConnectedRouter>
</ReduxProvider>
</IntlProvider>
</QueryClientProvider>
);
Expand Down
3 changes: 0 additions & 3 deletions src/setupTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ import { configure } from 'enzyme'; // eslint-disable-line import/no-extraneous-
import Adapter from '@wojtekmaj/enzyme-adapter-react-17'; // eslint-disable-line import/no-extraneous-dependencies
import '@testing-library/jest-dom'; // eslint-disable-line import/no-extraneous-dependencies

// necessary due to https://github.com/facebook/create-react-app/issues/7539
jest.mock('retranslate', () => jest.requireActual('../__mocks__/retranslate'));

jest.mock('react-intl', () => {
const reactIntl = jest.requireActual('react-intl');
const intl = reactIntl.createIntl({
Expand Down
13 changes: 5 additions & 8 deletions src/test/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { ConnectedRouter, routerMiddleware } from 'connected-react-router';
import { QueryClient, QueryClientProvider } from 'react-query';
import React from 'react';
import { render, RenderResult } from '@testing-library/react';
import { TranslationProvider } from 'retranslate';
import { IntlProvider } from 'react-intl';
import translations from '../components/translations';
import { MOBILE_AUTHENTICATION_SUCCESS } from '../components/login/constants';
Expand All @@ -22,13 +21,11 @@ export function renderWrapped(
): RenderResult {
const wrapper = (component: React.ReactNode) => (
<IntlProvider locale="en" messages={translations.en} defaultLocale="et">
<TranslationProvider language="en" messages={translations} fallbackLanguage="et">
<ReduxProvider store={store}>
<QueryClientProvider client={new QueryClient()}>
<ConnectedRouter history={history}>{component}</ConnectedRouter>
</QueryClientProvider>
</ReduxProvider>
</TranslationProvider>
<ReduxProvider store={store}>
<QueryClientProvider client={new QueryClient()}>
<ConnectedRouter history={history}>{component}</ConnectedRouter>
</QueryClientProvider>
</ReduxProvider>
</IntlProvider>
);
const view = render(wrapper(children));
Expand Down

0 comments on commit b67cdc0

Please sign in to comment.