Fix tests & add missing tests

felixmosh · Jul 19, 2022 · 8e35aa5 · 8e35aa5
1 parent c2c920f
commit 8e35aa5
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 10 deletions.
diff --git a/__tests__/client-hmr.spec.js b/__tests__/client-hmr.spec.js
@@ -42,11 +42,17 @@ describe('client-hmr', () => {
     jest.restoreAllMocks();
   });
 
-  it('should warn regarding missing backend options', () => {
+  it('should warn regarding missing backend options once', () => {
     jest.spyOn(global.console, 'warn');
+    i18nMock.options = { ns: ['name-space'] };
+
     applyClientHMR(i18nMock);
+    whenHotTriggeredWith(['en/name-space']);
+    applyClientHMR(i18nMock);
+
+    expect(global.console.warn).toHaveBeenCalledTimes(1);
     expect(global.console.warn).toHaveBeenCalledWith(
-      expect.stringContaining('i18next-backend not found'),
+      expect.stringContaining('i18next-http-backend not found'),
       expect.any(String),
       expect.any(String)
     );
@@ -96,6 +102,22 @@ describe('client-hmr', () => {
     expect(i18nMock.changeLanguage).toHaveBeenCalledWith('en');
   });
 
+  it('should trigger reload when i18n given as a getter function', async () => {
+    i18nMock.options = { backend: {}, ns: ['name-space'] };
+    i18nMock.language = 'en';
+
+    applyClientHMR(() => i18nMock);
+
+    await whenHotTriggeredWith(['en/name-space']);
+
+    expect(i18nMock.reloadResources).toHaveBeenCalledWith(
+      ['en'],
+      ['name-space'],
+      expect.any(Function)
+    );
+    expect(i18nMock.changeLanguage).toHaveBeenCalledWith('en');
+  });
+
   it('should trigger reload when lng-country combination file changed', async () => {
     i18nMock.options = { backend: {}, ns: ['name-space'] };
     i18nMock.language = 'en-US';

diff --git a/__tests__/server-hmr.spec.js b/__tests__/server-hmr.spec.js
@@ -54,6 +54,18 @@ describe('server-hmr', () => {
       );
     });
 
+    it('should notify that server HMR started HMR mode once', async () => {
+      jest.spyOn(global.console, 'log');
+
+      applyServerHMR(i18nMock); // second call
+
+      expect(global.console.log).toHaveBeenCalledTimes(1);
+      expect(global.console.log).toHaveBeenCalledWith(
+        expect.stringContaining('Server HMR has started')
+      );
+      expect(global.console.log).not.toHaveBeenCalledWith(expect.stringContaining('callback mode'));
+    });
+
     it('should reload resources on updated lang, ns', () => {
       const update = { lang: 'en', ns: 'name-space' };
       whenNativeHMRTriggeredWith([`${update.lang}/${update.ns}`]);
@@ -154,6 +166,17 @@ describe('server-hmr', () => {
       expect(plugin.addListener).toHaveBeenCalled();
     });
 
+    it('should notify that server HMR started as callback mode once', async () => {
+      jest.spyOn(global.console, 'log');
+
+      applyServerHMR(i18nMock); // second call
+
+      expect(global.console.log).toHaveBeenCalledTimes(1);
+      expect(global.console.log).toHaveBeenCalledWith(
+        expect.stringContaining('Server HMR has started - callback mode')
+      );
+    });
+
     it('should reload resources on updated lang, ns', () => {
       const update = { lang: 'en', ns: 'name-space' };
       plugin.callbacks[0]({ changedFiles: [`${update.lang}/${update.ns}`] });
@@ -230,4 +253,27 @@ describe('server-hmr', () => {
       );
     });
   });
+
+  describe('i18n as a getter', () => {
+    beforeEach(() => {
+      global.mockModule = {
+        hot: {
+          accept: jest.fn(),
+        },
+      };
+
+      applyServerHMR(() => i18nMock);
+    });
+
+    it('should reload resources on updated lang, ns', () => {
+      const update = { lang: 'en', ns: 'name-space' };
+      whenNativeHMRTriggeredWith([`${update.lang}/${update.ns}`]);
+
+      expect(i18nMock.reloadResources).toHaveBeenCalledWith(
+        [update.lang],
+        [update.ns],
+        expect.any(Function)
+      );
+    });
+  });
 });
diff --git a/lib/utils.js b/lib/utils.js
@@ -37,19 +37,16 @@ function makeUniqueList(list) {
   return [...new Set(list)];
 }
 
-function createLoggerOnce(log) {
+function createLoggerOnce(logger) {
   const msgCount = new Map();
   return (msg, type = 'log') => {
-    if (!msgCount.has(msg)) {
-      msgCount.set(msg, 0);
-    }
-
-    if (msgCount.get(msg) >= 1) {
+    const count = msgCount.has(msg) ? msgCount.get(msg) : 0;
+    if (count > 0) {
       return;
     }
 
-    log(msg, type);
-    msgCount.set(msg, 1);
+    logger(msg, type);
+    msgCount.set(msg, count + 1);
   };
 }