Merge pull request #1065 from aralroca/add-tests-flat-keys

add tests about flat keys when keySeparator=false

__tests__/Trans.test.js

@@ -110,6 +110,23 @@ describe('Trans', () => {
       expect(container.textContent).toContain(expected)
     })
 
+    test('should work with flat keys', () => {
+      const i18nKey = 'this.is.a.flat.key'
+      const expected = 'The number is 42'
+      const ns = {
+        'this.is.a.flat.key': 'The number is 42',
+      }
+
+      const config = { keySeparator: false }
+
+      const { container } = render(
+        <I18nProvider lang="en" namespaces={{ ns }} config={config}>
+          <Trans i18nKey={i18nKey} ns="ns" />
+        </I18nProvider>
+      )
+      expect(container.textContent).toContain(expected)
+    })
+
     test('should work the same way than useTranslate with default value', () => {
       console.warn = jest.fn()
       const i18nKey = 'ns:number'

__tests__/getT.test.js

@@ -1,23 +1,27 @@
 import getT from '../src/getT'
 
+const mockLoadLocaleFrom = jest.fn()
+
+global.i18nConfig = {
+  keySeparator: false,
+  loadLocaleFrom: (...args) => mockLoadLocaleFrom(...args),
+}
+
 describe('getT', () => {
-  beforeAll(() => {
-    global.i18nConfig = {
-      loadLocaleFrom: (__lang, ns) => {
-        if (ns === 'ns1') {
-          return Promise.resolve({
-            key_ns1: 'message from ns1',
-          })
-        }
-        if (ns === 'ns2') {
-          return Promise.resolve({
-            key_ns2: 'message from ns2',
-          })
-        }
-      },
-    }
+  beforeEach(() => {
+    mockLoadLocaleFrom.mockImplementation((__lang, ns) => {
+      if (ns === 'ns1') {
+        return Promise.resolve({
+          key_ns1: 'message from ns1',
+        })
+      }
+      if (ns === 'ns2') {
+        return Promise.resolve({
+          key_ns2: 'message from ns2',
+        })
+      }
+    })
   })
-
   test('should load one namespace and translate + warning', async () => {
     console.warn = jest.fn()
     const t = await getT('en', 'ns1')
@@ -30,6 +34,14 @@ describe('getT', () => {
     expect(console.warn).toBeCalledWith(expectedWarning)
   })
 
+  test('should work with flat keys', async () => {
+    mockLoadLocaleFrom.mockImplementationOnce(async (__lang, ns) => ({
+      'this.is.a.flat.key': 'works',
+    }))
+    const t = await getT('en', 'common')
+    expect(t('this.is.a.flat.key')).toEqual('works')
+  })
+
   test('should load multiple namespaces and translate', async () => {
     const t = await getT('en', ['ns1', 'ns2'])
     expect(typeof t).toBe('function')

__tests__/transCore.test.js

@@ -66,6 +66,18 @@ describe('transCore', () => {
     ).toEqual(nsRootKeys)
   })
 
+  test('should allow flat keys when keySeparator=false', async () => {
+    const t = transCore({
+      config: {
+        keySeparator: false,
+      },
+      allNamespaces: { common: { 'example.flat.key': 'works' } },
+      lang: 'en',
+    })
+
+    expect(t('common:example.flat.key')).toEqual('works')
+  })
+
   test('should return an object of nested keys', async () => {
     const t = transCore({
       config: {},

__tests__/useTranslation.test.js

@@ -227,6 +227,30 @@ describe('useTranslation', () => {
       expect(container.textContent).toBe(expected)
     })
 
+    test('should work with flat key', () => {
+      const Inner = () => {
+        const { t } = useTranslation('a')
+        return t`this.is.a.flat.key`
+      }
+
+      const ns = {
+        a: { 'this.is.a.flat.key': 'works' },
+      }
+
+      const expected = 'works'
+
+      const { container } = render(
+        <I18nProvider
+          lang="en"
+          namespaces={ns}
+          config={{ keySeparator: false }}
+        >
+          <Inner />
+        </I18nProvider>
+      )
+      expect(container.textContent).toBe(expected)
+    })
+
     test('should work with a defined default namespace | t as function', () => {
       const Inner = () => {
         const { t } = useTranslation('a')