-
-
Notifications
You must be signed in to change notification settings - Fork 764
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: Require absolute localePath, and refactor out usage of eval
- Loading branch information
1 parent
77a6038
commit 826a9a5
Showing
17 changed files
with
1,292 additions
and
331 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| **/node_modules | ||
| **/out | ||
| **/out | ||
| src/create-client/package.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| import i18next from 'i18next' | ||
| import I18nextBrowserLanguageDetector from 'i18next-browser-languagedetector' | ||
| import createI18nextClient from '../../src/create-client/browser' | ||
|
|
||
| const i18nextMiddleware = require('i18next-http-middleware') | ||
|
|
||
| jest.mock('i18next', () => ({ | ||
| init: jest.fn(() => new Promise(resolve => setTimeout(() => resolve(), 0))), | ||
| use: jest.fn(), | ||
| })) | ||
|
|
||
| jest.mock('i18next-http-middleware', () => ({ | ||
| LanguageDetector: jest.fn(), | ||
| })) | ||
|
|
||
| const I18nextBrowserLanguageDetectorInit = I18nextBrowserLanguageDetector.prototype.addDetector = jest.fn() | ||
|
|
||
| describe('initializing i18n', () => { | ||
| beforeEach(() => { | ||
| i18next.isInitialized = false | ||
| }) | ||
|
|
||
| afterEach(() => { | ||
| (i18next.init as jest.Mock).mockClear(); | ||
| (i18next.use as jest.Mock).mockClear() | ||
| i18nextMiddleware.LanguageDetector.mockClear() | ||
| I18nextBrowserLanguageDetectorInit.mockClear() | ||
| }) | ||
|
|
||
| it('should return both the i18n object and an initPromise', async () => { | ||
| const { i18n, initPromise } = createI18nextClient({ | ||
| use: [], | ||
| customDetectors: [], | ||
| }) | ||
| expect(typeof i18n.isInitialized).toBe('boolean') | ||
| expect(typeof initPromise.then).toBe('function') | ||
| }) | ||
|
|
||
| it('should not initialize i18n if i18n is already initialized', () => { | ||
| i18next.isInitialized = true | ||
|
|
||
| createI18nextClient({ | ||
| use: [], | ||
| customDetectors: [], | ||
| serverLanguageDetection: true, | ||
| browserLanguageDetection: true, | ||
| }) | ||
|
|
||
| expect(i18next.init).not.toBeCalled() | ||
| expect(i18next.use).not.toBeCalled() | ||
| }) | ||
|
|
||
| it('should initialize i18n if i18n is not yet initialized', () => { | ||
| i18next.isInitialized = false | ||
|
|
||
| createI18nextClient({ | ||
| use: [], | ||
| customDetectors: [], | ||
| serverLanguageDetection: true, | ||
| browserLanguageDetection: true, | ||
| }) | ||
|
|
||
| expect(i18next.use).toBeCalledTimes(2) | ||
| expect(i18next.init).toBeCalledTimes(1) | ||
| }) | ||
|
|
||
| it('should not add backend language detector', () => { | ||
| i18next.isInitialized = false | ||
|
|
||
| createI18nextClient({ | ||
| use: [], | ||
| customDetectors: [], | ||
| serverLanguageDetection: true, | ||
| browserLanguageDetection: true, | ||
| }) | ||
|
|
||
| expect(i18nextMiddleware.LanguageDetector).not.toBeCalled() | ||
| expect(I18nextBrowserLanguageDetectorInit).toBeCalled() | ||
| expect(i18next.use).toBeCalledTimes(2) | ||
| expect(i18next.init).toBeCalled() | ||
| }) | ||
|
|
||
| it('should call addDetector with the right detector if browserLanguageDetection is true', () => { | ||
| i18next.isInitialized = false | ||
|
|
||
| createI18nextClient({ | ||
| use: [], | ||
| customDetectors: ['test_custom_detector'], | ||
| browserLanguageDetection: true, | ||
| }) | ||
| expect(i18nextMiddleware.LanguageDetector).not.toBeCalled() | ||
| expect(I18nextBrowserLanguageDetectorInit).toBeCalled() | ||
| expect(I18nextBrowserLanguageDetectorInit).toBeCalledWith('test_custom_detector') | ||
| expect(i18next.use).toBeCalledTimes(2) | ||
| expect(i18next.init).toBeCalledTimes(1) | ||
| }) | ||
|
|
||
| it('should not call addDetector if browserLanguageDetection is false', () => { | ||
| i18next.isInitialized = false | ||
| const addDetector = jest.fn() | ||
| i18nextMiddleware.LanguageDetector.mockImplementation(() => ({ | ||
| addDetector, | ||
| })) | ||
|
|
||
| createI18nextClient({ | ||
| use: [], | ||
| customDetectors: ['test_custom_detector'], | ||
| browserLanguageDetection: false, | ||
| }) | ||
| expect(i18nextMiddleware.LanguageDetector).not.toBeCalled() | ||
| expect(I18nextBrowserLanguageDetectorInit).not.toBeCalled() | ||
| expect(addDetector).not.toBeCalled() | ||
| expect(i18next.use).toBeCalledTimes(1) | ||
| expect(i18next.init).toBeCalledTimes(1) | ||
| }) | ||
| }) |
2 changes: 1 addition & 1 deletion
2
__tests__/create-i18next-client.test.ts → __tests__/create-client/server.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| const NextI18Next = require('next-i18next').default | ||
| const { localeSubpaths } = require('next/config').default().publicRuntimeConfig | ||
| const path = require('path') | ||
|
|
||
| module.exports = new NextI18Next({ | ||
| otherLanguages: ['de'], | ||
| localeSubpaths, | ||
| localePath: path.resolve('./public/static/locales') | ||
| }) |
Oops, something went wrong.