jest-webextension-mock 3.9.0 → 4.0.0

package/.github/workflows/push.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [18.x, 20.x, 22.x]
 
     steps:
       - uses: actions/checkout@v3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # jest-webextension-mock
 
+## 4.0.0
+
+### Major Changes
+
+- b8594f9: Drop support for node 14 and 16, add support for node 18 and 22
+
+## 3.9.1
+
+### Patch Changes
+
+- Fix storage returning undefined for unknown keys
+
 ## 3.9.0
 
 ### Minor Changes

package/__tests__/browserAction.test.js

@@ -5,8 +5,8 @@ describe('browser.browserAction', () => {
     browser.browserAction.setTitle(title);
     expect(browser.browserAction.setTitle).toHaveBeenCalledWith(title);
   });
-  test('getTitle', (done) => {
-    const callback = jest.fn(() => done());
+  test('getTitle', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(browser.browserAction.getTitle)).toBe(true);
     browser.browserAction.getTitle({}, callback);
     expect(browser.browserAction.getTitle).toHaveBeenCalledTimes(1);
@@ -29,8 +29,8 @@ describe('browser.browserAction', () => {
     browser.browserAction.setPopup(details);
     expect(browser.browserAction.setPopup).toHaveBeenCalledWith(details);
   });
-  test('getPopup', (done) => {
-    const callback = jest.fn(() => done());
+  test('getPopup', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(browser.browserAction.getPopup)).toBe(true);
     browser.browserAction.getPopup({}, callback);
     expect(browser.browserAction.getPopup).toHaveBeenCalledTimes(1);
@@ -46,8 +46,8 @@ describe('browser.browserAction', () => {
     browser.browserAction.setBadgeText(text);
     expect(browser.browserAction.setBadgeText).toHaveBeenCalledWith(text);
   });
-  test('getBadgeText', (done) => {
-    const callback = jest.fn(() => done());
+  test('getBadgeText', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(browser.browserAction.getBadgeText)).toBe(true);
     browser.browserAction.getBadgeText({}, callback);
     expect(browser.browserAction.getBadgeText).toHaveBeenCalledTimes(1);
@@ -69,8 +69,8 @@ describe('browser.browserAction', () => {
       details
     );
   });
-  test('getBadgeBackgroundColor', (done) => {
-    const callback = jest.fn(() => done());
+  test('getBadgeBackgroundColor', () => {
+    const callback = jest.fn();
     expect(
       jest.isMockFunction(browser.browserAction.getBadgeBackgroundColor)
     ).toBe(true);

package/__tests__/commands.test.js

@@ -1,6 +1,6 @@
 describe('browser.commands', () => {
-  test('getAll', (done) => {
-    const callback = jest.fn(() => done());
+  test('getAll', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(browser.commands.getAll)).toBe(true);
     browser.commands.getAll(callback);
     expect(browser.commands.getAll).toHaveBeenCalledTimes(1);

package/__tests__/downloads.test.js

@@ -1,12 +1,15 @@
 describe('browser.downloads', () => {
-  test('acceptDanger', (done) => {
+  test('acceptDanger', () => {
     const downloadId = 1;
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.downloads.acceptDanger)).toBe(true);
     chrome.downloads.acceptDanger(downloadId, callback);
     expect(chrome.downloads.acceptDanger).toHaveBeenCalledTimes(1);
-    expect(chrome.downloads.acceptDanger).toHaveBeenLastCalledWith(downloadId, callback);
+    expect(chrome.downloads.acceptDanger).toHaveBeenLastCalledWith(
+      downloadId,
+      callback
+    );
     expect(callback).toHaveBeenCalled();
   });
   test('acceptDanger Promise', () => {
@@ -14,14 +17,17 @@ describe('browser.downloads', () => {
 
     expect(chrome.downloads.acceptDanger(downloadId)).resolves.toBeUndefined();
   });
-  test('cancel', (done) => {
+  test('cancel', () => {
     const downloadId = 1;
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.downloads.cancel)).toBe(true);
     chrome.downloads.cancel(downloadId, callback);
     expect(chrome.downloads.cancel).toHaveBeenCalledTimes(1);
-    expect(chrome.downloads.cancel).toHaveBeenLastCalledWith(downloadId, callback);
+    expect(chrome.downloads.cancel).toHaveBeenLastCalledWith(
+      downloadId,
+      callback
+    );
     expect(callback).toHaveBeenCalled();
   });
   test('cancel Promise', () => {
@@ -29,14 +35,17 @@ describe('browser.downloads', () => {
 
     expect(chrome.downloads.cancel(downloadId)).resolves.toBeUndefined();
   });
-  test('download', (done) => {
+  test('download', () => {
     const options = {};
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.downloads.download)).toBe(true);
     chrome.downloads.download(options, callback);
     expect(chrome.downloads.download).toHaveBeenCalledTimes(1);
-    expect(chrome.downloads.download).toHaveBeenLastCalledWith(options, callback);
+    expect(chrome.downloads.download).toHaveBeenLastCalledWith(
+      options,
+      callback
+    );
     expect(callback).toHaveBeenCalled();
   });
   test('download Promise', () => {
@@ -44,9 +53,9 @@ describe('browser.downloads', () => {
 
     expect(chrome.downloads.download(options)).resolves.toBeUndefined();
   });
-  test('erase', (done) => {
+  test('erase', () => {
     const query = {};
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.downloads.erase)).toBe(true);
     chrome.downloads.erase(query, callback);
@@ -59,14 +68,17 @@ describe('browser.downloads', () => {
 
     expect(chrome.downloads.erase(query)).resolves.toBeUndefined();
   });
-  test('getFileIcon', (done) => {
+  test('getFileIcon', () => {
     const downloadId = 1;
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.downloads.getFileIcon)).toBe(true);
     chrome.downloads.getFileIcon(downloadId, callback);
     expect(chrome.downloads.getFileIcon).toHaveBeenCalledTimes(1);
-    expect(chrome.downloads.getFileIcon).toHaveBeenLastCalledWith(downloadId, callback);
+    expect(chrome.downloads.getFileIcon).toHaveBeenLastCalledWith(
+      downloadId,
+      callback
+    );
     expect(callback).toHaveBeenCalled();
   });
   test('getFileIcon Promise', () => {
@@ -82,14 +94,17 @@ describe('browser.downloads', () => {
     expect(chrome.downloads.open).toHaveBeenCalledTimes(1);
     expect(chrome.downloads.open).toHaveBeenLastCalledWith(downloadId);
   });
-  test('pause', (done) => {
+  test('pause', () => {
     const downloadId = 1;
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.downloads.pause)).toBe(true);
     chrome.downloads.pause(downloadId, callback);
     expect(chrome.downloads.pause).toHaveBeenCalledTimes(1);
-    expect(chrome.downloads.pause).toHaveBeenLastCalledWith(downloadId, callback);
+    expect(chrome.downloads.pause).toHaveBeenLastCalledWith(
+      downloadId,
+      callback
+    );
     expect(callback).toHaveBeenCalled();
   });
   test('pause Promise', () => {
@@ -97,14 +112,17 @@ describe('browser.downloads', () => {
 
     expect(chrome.downloads.pause(downloadId)).resolves.toBeUndefined();
   });
-  test('removeFile', (done) => {
+  test('removeFile', () => {
     const downloadId = 1;
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.downloads.removeFile)).toBe(true);
     chrome.downloads.removeFile(downloadId, callback);
     expect(chrome.downloads.removeFile).toHaveBeenCalledTimes(1);
-    expect(chrome.downloads.removeFile).toHaveBeenLastCalledWith(downloadId, callback);
+    expect(chrome.downloads.removeFile).toHaveBeenLastCalledWith(
+      downloadId,
+      callback
+    );
     expect(callback).toHaveBeenCalled();
   });
   test('removeFile Promise', () => {
@@ -112,14 +130,17 @@ describe('browser.downloads', () => {
 
     expect(chrome.downloads.removeFile(downloadId)).resolves.toBeUndefined();
   });
-  test('resume', (done) => {
+  test('resume', () => {
     const downloadId = 1;
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.downloads.resume)).toBe(true);
     chrome.downloads.resume(downloadId, callback);
     expect(chrome.downloads.resume).toHaveBeenCalledTimes(1);
-    expect(chrome.downloads.resume).toHaveBeenLastCalledWith(downloadId, callback);
+    expect(chrome.downloads.resume).toHaveBeenLastCalledWith(
+      downloadId,
+      callback
+    );
     expect(callback).toHaveBeenCalled();
   });
   test('resume Promise', () => {
@@ -127,9 +148,9 @@ describe('browser.downloads', () => {
 
     expect(chrome.downloads.resume(downloadId)).resolves.toBeUndefined();
   });
-  test('search', (done) => {
+  test('search', () => {
     const query = {};
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.downloads.search)).toBe(true);
     chrome.downloads.search(query, callback);

package/__tests__/notifications.test.js

@@ -1,7 +1,7 @@
 describe('chrome.notifications', () => {
-  test('create', (done) => {
+  test('create', () => {
     const options = { type: 'basic' };
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.notifications.create)).toBe(true);
 
@@ -31,9 +31,9 @@ describe('chrome.notifications', () => {
     );
   });
 
-  test('update', (done) => {
+  test('update', () => {
     const options = { type: 'basic' };
-    const callback = jest.fn(() => done());
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.notifications.update)).toBe(true);
     chrome.notifications.update('id', options, callback);
@@ -52,8 +52,8 @@ describe('chrome.notifications', () => {
     return expect(chrome.notifications.update(options)).resolves.toBe(true);
   });
 
-  test('clear', (done) => {
-    const callback = jest.fn(() => done());
+  test('clear', () => {
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.notifications.clear)).toBe(true);
     chrome.notifications.clear('id', callback);
@@ -66,8 +66,8 @@ describe('chrome.notifications', () => {
     return expect(chrome.notifications.clear('id')).resolves.toBe(true);
   });
 
-  test('getAll', (done) => {
-    const callback = jest.fn(() => done());
+  test('getAll', () => {
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.notifications.getAll)).toBe(true);
     chrome.notifications.getAll(callback);
@@ -80,8 +80,8 @@ describe('chrome.notifications', () => {
     return expect(chrome.notifications.getAll()).resolves.toEqual([]);
   });
 
-  test('getPermissionLevel', (done) => {
-    const callback = jest.fn(() => done());
+  test('getPermissionLevel', () => {
+    const callback = jest.fn();
 
     expect(jest.isMockFunction(chrome.notifications.getPermissionLevel)).toBe(
       true

package/__tests__/runtime.test.js

@@ -20,23 +20,26 @@ describe('browser.runtime', () => {
     expect(jest.isMockFunction(connection.disconnect)).toBe(true);
     expect(browser.runtime.connect).toHaveBeenCalledTimes(1);
   });
-  test('connect.onMessage listener', (done) => {
+  test('connect.onMessage listener', () => {
     const name = 'CONNECT_NAME';
     const listener = jest.fn();
+    const callback = jest.fn();
     browser.runtime.connect(name).onMessage.addListener(listener);
-    browser.runtime.sendMessage({ test: 'message' }, done);
+    browser.runtime.sendMessage({ test: 'message' }, callback);
     expect(listener).toHaveBeenCalledWith({ test: 'message' });
+    expect(callback).toHaveBeenCalledTimes(1);
   });
   test('getURL', () => {
     const path = 'TEST_PATH';
-    const extensionOriginURL = globalThis[Symbol.for('jest-webextension-mock')].extensionPath;
+    const extensionOriginURL =
+      globalThis[Symbol.for('jest-webextension-mock')].extensionPath;
     expect(jest.isMockFunction(browser.runtime.getURL)).toBe(true);
     const respPath = browser.runtime.getURL(path);
     expect(respPath).toEqual(extensionOriginURL + path);
     expect(browser.runtime.getURL).toHaveBeenCalledTimes(1);
   });
-  test('sendMessage', (done) => {
-    const callback = jest.fn(() => done());
+  test('sendMessage', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(browser.runtime.sendMessage)).toBe(true);
     browser.runtime.sendMessage({ test: 'message' }, callback);
     expect(browser.runtime.sendMessage).toHaveBeenCalledTimes(1);
@@ -44,11 +47,13 @@ describe('browser.runtime', () => {
     browser.runtime.sendMessage({ test: 'message' });
     expect(browser.runtime.sendMessage).toHaveBeenCalledTimes(2);
   });
-  test('sendMessage listener', (done) => {
+  test('sendMessage listener', () => {
     const listener = jest.fn();
+    const callback = jest.fn();
     browser.runtime.onMessage.addListener(listener);
-    browser.runtime.sendMessage({ test: 'message' }, done);
+    browser.runtime.sendMessage({ test: 'message' }, callback);
     expect(listener).toHaveBeenCalledWith({ test: 'message' });
+    expect(callback).toHaveBeenCalledTimes(1);
   });
   test('sendMessage promise', () => {
     return expect(browser.runtime.sendMessage({})).resolves.toBeUndefined();
@@ -85,32 +90,38 @@ describe('browser.runtime', () => {
   });
   test(`onMessageExternal.addListener`, () => {
     const callback = jest.fn();
-    expect(jest.isMockFunction(browser.runtime.onMessageExternal.addListener)).toBe(
-      true
-    );
+    expect(
+      jest.isMockFunction(browser.runtime.onMessageExternal.addListener)
+    ).toBe(true);
     browser.runtime.onMessageExternal.addListener(callback);
-    expect(browser.runtime.onMessageExternal.addListener).toHaveBeenCalledTimes(1);
+    expect(browser.runtime.onMessageExternal.addListener).toHaveBeenCalledTimes(
+      1
+    );
     expect(callback).toHaveBeenCalledTimes(0);
   });
   test(`onMessageExternal.removeListener`, () => {
     const callback = jest.fn();
-    expect(jest.isMockFunction(browser.runtime.onMessageExternal.removeListener)).toBe(
-      true
-    );
+    expect(
+      jest.isMockFunction(browser.runtime.onMessageExternal.removeListener)
+    ).toBe(true);
     browser.runtime.onMessageExternal.removeListener(callback);
     expect(browser.runtime.onMessageExternal.hasListener(callback)).toBe(false);
-    expect(browser.runtime.onMessageExternal.removeListener).toHaveBeenCalledTimes(1);
+    expect(
+      browser.runtime.onMessageExternal.removeListener
+    ).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenCalledTimes(0);
   });
   test(`onMessageExternal.hasListener`, () => {
     const callback = jest.fn();
-    expect(jest.isMockFunction(browser.runtime.onMessageExternal.hasListener)).toBe(
-      true
-    );
+    expect(
+      jest.isMockFunction(browser.runtime.onMessageExternal.hasListener)
+    ).toBe(true);
     browser.runtime.onMessageExternal.addListener(callback);
     const returnVal = browser.runtime.onMessageExternal.hasListener(callback);
     expect(returnVal).toBe(true);
-    expect(browser.runtime.onMessageExternal.hasListener).toHaveBeenCalledTimes(1);
+    expect(browser.runtime.onMessageExternal.hasListener).toHaveBeenCalledTimes(
+      1
+    );
     expect(callback).toHaveBeenCalledTimes(0);
   });
   ['addListener', 'removeListener', 'hasListener'].forEach((method) => {

package/__tests__/storage.test.js

@@ -19,32 +19,21 @@ describe('browser.storage', () => {
         test('a string key', (done) => {
           const key = 'test';
           storage.get(key, (result) => {
-            expect(result).toBeDefined();
-            expect(typeof result === 'object').toBeTruthy();
-            expect(result).toHaveProperty(key, undefined);
+            expect(result).toStrictEqual({});
             done();
           });
         });
         test('an array key', (done) => {
           const keys = ['test1', 'test2'];
           storage.get(keys, (result) => {
-            expect(result).toBeDefined();
-            expect(typeof result === 'object').toBeTruthy();
-            keys.forEach((k) => {
-              expect(result).toHaveProperty(k, undefined);
-            });
+            expect(result).toStrictEqual({});
             done();
           });
         });
         test('an object key', (done) => {
           const key = { test: [] };
           storage.get(key, (result) => {
-            expect(result).toBeDefined();
-            expect(typeof result === 'object').toBeTruthy();
-            Object.keys(key).forEach((k) => {
-              expect(result).toHaveProperty(k);
-              expect(result[k]).toEqual(key[k]);
-            });
+            expect(result).toStrictEqual({ test: [] });
             done();
           });
         });
@@ -71,8 +60,8 @@ describe('browser.storage', () => {
         const key = 'key';
         return expect(storage.get(key)).resolves.toEqual({ key: undefined });
       });
-      test('getBytesInUse', (done) => {
-        const callback = jest.fn(() => done());
+      test('getBytesInUse', () => {
+        const callback = jest.fn();
         expect(jest.isMockFunction(storage.getBytesInUse)).toBe(true);
         storage.getBytesInUse('key', callback);
         expect(storage.getBytesInUse).toHaveBeenCalledTimes(1);
@@ -81,8 +70,8 @@ describe('browser.storage', () => {
       test('getBytesInUse promise', () => {
         return expect(storage.getBytesInUse('key')).resolves.toBe(0);
       });
-      test('set', (done) => {
-        const callback = jest.fn(() => done());
+      test('set', () => {
+        const callback = jest.fn();
         expect(jest.isMockFunction(storage.set)).toBe(true);
         storage.set({ key: 'foo' }, callback);
         expect(storage.set).toHaveBeenCalledTimes(1);
@@ -91,8 +80,8 @@ describe('browser.storage', () => {
       test('set promise', () => {
         return expect(storage.set(1)).resolves.toBeUndefined();
       });
-      test('remove', (done) => {
-        const callback = jest.fn(() => done());
+      test('remove', () => {
+        const callback = jest.fn();
         expect(jest.isMockFunction(storage.remove)).toBe(true);
         storage.remove('key', callback);
         expect(storage.remove).toHaveBeenCalledTimes(1);
@@ -101,8 +90,8 @@ describe('browser.storage', () => {
       test('remove promise', () => {
         return expect(storage.remove(['foo', 'bar'])).resolves.toBeUndefined();
       });
-      test('clear', (done) => {
-        const callback = jest.fn(() => done());
+      test('clear', () => {
+        const callback = jest.fn();
         expect(jest.isMockFunction(browser.storage.sync.clear)).toBe(true);
         storage.clear(callback);
         expect(storage.clear).toHaveBeenCalledTimes(1);
@@ -120,24 +109,16 @@ describe('browser.storage', () => {
         storage.set({ key: 'value', foo: 'bar', foo2: 'bar2' }, () => {
           // get 'key'
           storage.get(['key'], (result) => {
-            expect(result).toBeDefined();
-            expect(typeof result === 'object').toBeTruthy();
-            expect(result).toHaveProperty('key', 'value');
-            expect(result).not.toHaveProperty('foo');
-            expect(result).not.toHaveProperty('foo2');
+            expect(result).toStrictEqual({ key: 'value' });
             // remove 'key'
             storage.remove('key', () => {
               // get all values
               storage.get(null, (result) => {
-                expect(result).toHaveProperty('key', undefined);
-                expect(result).toHaveProperty('foo', 'bar');
-                expect(result).toHaveProperty('foo2', 'bar2');
+                expect(result).toStrictEqual({ foo: 'bar', foo2: 'bar2' });
                 // clear values
                 storage.clear(() => {
                   storage.get(['key', 'foo', 'foo2'], (result) => {
-                    expect(result).toHaveProperty('key', undefined);
-                    expect(result).toHaveProperty('foo', undefined);
-                    expect(result).toHaveProperty('foo2', undefined);
+                    expect(result).toStrictEqual({});
                     done();
                   });
                 });

package/__tests__/tabs.test.js

@@ -1,13 +1,13 @@
 describe('browser.tabs', () => {
-  test('get', (done) => {
-    const callback = jest.fn(() => done());
+  test('get', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(chrome.tabs.get)).toBe(true);
     chrome.tabs.get(1, callback);
     expect(chrome.tabs.get).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenCalledTimes(1);
   });
-  test('getCurrent', (done) => {
-    const callback = jest.fn(() => done());
+  test('getCurrent', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(chrome.tabs.getCurrent)).toBe(true);
     chrome.tabs.getCurrent(callback);
     expect(chrome.tabs.getCurrent).toHaveBeenCalledTimes(1);
@@ -24,8 +24,8 @@ describe('browser.tabs', () => {
     expect(jest.isMockFunction(connection.onMessage.addListener)).toBe(true);
     expect(chrome.tabs.connect).toHaveBeenCalledTimes(1);
   });
-  test('create', (done) => {
-    const callback = jest.fn(() => done());
+  test('create', () => {
+    const callback = jest.fn();
     const props = { pinned: true };
     expect(jest.isMockFunction(chrome.tabs.create)).toBe(true);
     chrome.tabs.create(props, callback);
@@ -37,16 +37,16 @@ describe('browser.tabs', () => {
     const props = { pinned: true };
     return expect(chrome.tabs.create(props)).resolves.toBe(props);
   });
-  test('duplicate', (done) => {
-    const callback = jest.fn(() => done());
+  test('duplicate', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(chrome.tabs.duplicate)).toBe(true);
     chrome.tabs.duplicate(1, callback);
     expect(chrome.tabs.duplicate).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenCalledWith({ id: 1 });
   });
-  test('remove', (done) => {
-    const callback = jest.fn(() => done());
+  test('remove', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(chrome.tabs.remove)).toBe(true);
     chrome.tabs.remove([1], callback);
     expect(chrome.tabs.remove).toHaveBeenCalledTimes(1);
@@ -55,23 +55,23 @@ describe('browser.tabs', () => {
   test('remove promise', () => {
     expect(chrome.tabs.remove([1])).resolves.toBeUndefined();
   });
-  test('query', (done) => {
-    const callback = jest.fn(() => done());
+  test('query', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(chrome.tabs.query)).toBe(true);
     chrome.tabs.query({ pinned: true }, callback);
     expect(chrome.tabs.query).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenCalledWith([{}]);
   });
-  test('highlight', (done) => {
-    const callback = jest.fn(() => done());
+  test('highlight', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(chrome.tabs.highlight)).toBe(true);
     chrome.tabs.highlight({}, callback);
     expect(chrome.tabs.highlight).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenCalledTimes(1);
   });
-  test('update', (done) => {
-    const callback = jest.fn(() => done());
+  test('update', () => {
+    const callback = jest.fn();
     const props = { pinned: true };
     expect(jest.isMockFunction(chrome.tabs.update)).toBe(true);
     chrome.tabs.update(1, props, callback);
@@ -81,8 +81,8 @@ describe('browser.tabs', () => {
     chrome.tabs.update(props);
     expect(chrome.tabs.update).toHaveBeenCalledTimes(2);
   });
-  test('move', (done) => {
-    const callback = jest.fn(() => done());
+  test('move', () => {
+    const callback = jest.fn();
     const props = { pinned: true };
     expect(jest.isMockFunction(chrome.tabs.move)).toBe(true);
     chrome.tabs.move([1, 2, 3], props, callback);
@@ -119,8 +119,8 @@ describe('browser.tabs', () => {
       expect(callback).toHaveBeenCalledTimes(0);
     });
   });
-  test('reload', (done) => {
-    const callback = jest.fn(() => done());
+  test('reload', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(chrome.tabs.reload)).toBe(true);
 
     chrome.tabs.reload(1, {}, callback);
@@ -128,8 +128,8 @@ describe('browser.tabs', () => {
     expect(chrome.tabs.reload).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenCalledTimes(1);
   });
-  test('sendMessage', (done) => {
-    const callback = jest.fn(() => done());
+  test('sendMessage', () => {
+    const callback = jest.fn();
     expect(jest.isMockFunction(chrome.tabs.sendMessage)).toBe(true);
     chrome.tabs.sendMessage(1, { test: 'message' }, callback);
     expect(chrome.tabs.sendMessage).toHaveBeenCalledTimes(1);
@@ -137,11 +137,13 @@ describe('browser.tabs', () => {
     chrome.tabs.sendMessage(1, { test: 'message' });
     expect(chrome.tabs.sendMessage).toHaveBeenCalledTimes(2);
   });
-  test('sendMessage listener', (done) => {
+  test('sendMessage listener', () => {
     const listener = jest.fn();
+    const callback = jest.fn();
     browser.runtime.onMessage.addListener(listener);
-    chrome.tabs.sendMessage(1, { test: 'message' }, done);
+    chrome.tabs.sendMessage(1, { test: 'message' }, callback);
     expect(listener).toHaveBeenCalledWith(1, { test: 'message' });
+    expect(callback).toHaveBeenCalledTimes(1);
   });
   test('sendMessage promise', () => {
     return expect(chrome.tabs.sendMessage({})).resolves.toBeUndefined();

package/dist/setup.js

@@ -1,47 +1,104 @@
 'use strict';
 
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
+}
+function _defineProperty(e, r, t) {
+  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+    value: t,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : e[r] = t, e;
+}
+function _iterableToArrayLimit(r, l) {
+  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (null != t) {
+    var e,
+      n,
+      i,
+      u,
+      a = [],
+      f = !0,
+      o = !1;
+    try {
+      if (i = (t = t.call(r)).next, 0 === l) {
+        if (Object(t) !== t) return;
+        f = !1;
+      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+    } catch (r) {
+      o = !0, n = r;
+    } finally {
+      try {
+        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
+      } finally {
+        if (o) throw n;
+      }
+    }
+    return a;
+  }
+}
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function ownKeys(e, r) {
+  var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
   }
-  return keys;
+  return t;
 }
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
     });
   }
-  return target;
+  return e;
+}
+function _slicedToArray(r, e) {
+  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
 }
-function _typeof(obj) {
+function _toPrimitive(t, r) {
+  if ("object" != typeof t || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != typeof i) return i;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return ("string" === r ? String : Number)(t);
+}
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : i + "";
+}
+function _typeof(o) {
   "@babel/helpers - typeof";
 
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
-    return typeof obj;
-  } : function (obj) {
-    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-  }, _typeof(obj);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+    return typeof o;
+  } : function (o) {
+    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+  }, _typeof(o);
 }
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
+function _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ("string" == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
   }
-  return obj;
 }
 
 // https://developer.chrome.com/extensions/omnibox
@@ -259,115 +316,34 @@ var createEventListeners = function createEventListeners() {
   };
 };
 
-var syncStore = {};
-var localStore = {};
-var managedStore = {};
 function resolveKey(key, store) {
   if (typeof key === 'string') {
-    var result = {};
-    result[key] = store[key];
-    return result;
+    if (key in store) {
+      return {
+        key: store[key]
+      };
+    } else {
+      return {};
+    }
   } else if (Array.isArray(key)) {
-    return key.reduce(function (acc, curr) {
-      acc[curr] = store[curr];
-      return acc;
+    return key.reduce(function (acc, currKey) {
+      return _objectSpread2(_objectSpread2({}, acc), resolveKey(currKey, store));
     }, {});
   } else if (_typeof(key) === 'object') {
-    return Object.keys(key).reduce(function (acc, curr) {
-      acc[curr] = store[curr] || key[curr];
-      return acc;
+    return Object.entries(key).reduce(function (acc, _ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+        currKey = _ref2[0],
+        fallbackValue = _ref2[1];
+      return _objectSpread2(_objectSpread2({}, acc), {}, _defineProperty({}, currKey, fallbackValue), resolveKey(currKey, store));
     }, {});
   }
   throw new Error('Wrong key given');
 }
-var storage = {
-  sync: {
-    get: jest.fn(function (id, cb) {
-      var result = id === null || id === undefined ? syncStore : resolveKey(id, syncStore);
-      if (cb !== undefined) {
-        return cb(result);
-      }
-      return Promise.resolve(result);
-    }),
-    getBytesInUse: jest.fn(function (id, cb) {
-      if (cb !== undefined) {
-        return cb(0);
-      }
-      return Promise.resolve(0);
-    }),
-    set: jest.fn(function (payload, cb) {
-      Object.keys(payload).forEach(function (key) {
-        return syncStore[key] = payload[key];
-      });
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    remove: jest.fn(function (id, cb) {
-      var keys = typeof id === 'string' ? [id] : id;
-      keys.forEach(function (key) {
-        return delete syncStore[key];
-      });
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    clear: jest.fn(function (cb) {
-      syncStore = {};
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    onChanged: createEventListeners()
-  },
-  local: {
-    get: jest.fn(function (id, cb) {
-      var result = id === null || id === undefined ? localStore : resolveKey(id, localStore);
-      if (cb !== undefined) {
-        return cb(result);
-      }
-      return Promise.resolve(result);
-    }),
-    getBytesInUse: jest.fn(function (id, cb) {
-      if (cb !== undefined) {
-        return cb(0);
-      }
-      return Promise.resolve(0);
-    }),
-    set: jest.fn(function (payload, cb) {
-      Object.keys(payload).forEach(function (key) {
-        return localStore[key] = payload[key];
-      });
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    remove: jest.fn(function (id, cb) {
-      var keys = typeof id === 'string' ? [id] : id;
-      keys.forEach(function (key) {
-        return delete localStore[key];
-      });
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    clear: jest.fn(function (cb) {
-      localStore = {};
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    onChanged: createEventListeners()
-  },
-  session: {
+function mockStore() {
+  var store = {};
+  return {
     get: jest.fn(function (id, cb) {
-      var result = id === null || id === undefined ? localStore : resolveKey(id, localStore);
+      var result = id === null || id === undefined ? store : resolveKey(id, store);
       if (cb !== undefined) {
         return cb(result);
       }
@@ -381,7 +357,7 @@ var storage = {
     }),
     set: jest.fn(function (payload, cb) {
       Object.keys(payload).forEach(function (key) {
-        return localStore[key] = payload[key];
+        return store[key] = payload[key];
       });
       if (cb !== undefined) {
         return cb();
@@ -391,7 +367,7 @@ var storage = {
     remove: jest.fn(function (id, cb) {
       var keys = typeof id === 'string' ? [id] : id;
       keys.forEach(function (key) {
-        return delete localStore[key];
+        return delete store[key];
       });
       if (cb !== undefined) {
         return cb();
@@ -399,56 +375,22 @@ var storage = {
       return Promise.resolve();
     }),
     clear: jest.fn(function (cb) {
-      localStore = {};
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    onChanged: createEventListeners()
-  },
-  managed: {
-    get: jest.fn(function (id, cb) {
-      var result = id === null || id === undefined ? managedStore : resolveKey(id, managedStore);
-      if (cb !== undefined) {
-        return cb(result);
-      }
-      return Promise.resolve(result);
-    }),
-    getBytesInUse: jest.fn(function (id, cb) {
-      if (cb !== undefined) {
-        return cb(0);
-      }
-      return Promise.resolve(0);
-    }),
-    set: jest.fn(function (payload, cb) {
-      Object.keys(payload).forEach(function (key) {
-        return managedStore[key] = payload[key];
-      });
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    remove: jest.fn(function (id, cb) {
-      var keys = typeof id === 'string' ? [id] : id;
-      keys.forEach(function (key) {
-        return delete managedStore[key];
+      Object.keys(store).forEach(function (key) {
+        return delete store[key];
       });
       if (cb !== undefined) {
         return cb();
       }
       return Promise.resolve();
     }),
-    clear: jest.fn(function (cb) {
-      managedStore = {};
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
     onChanged: createEventListeners()
-  },
+  };
+}
+var storage = {
+  sync: mockStore(),
+  local: mockStore(),
+  session: mockStore(),
+  managed: mockStore(),
   onChanged: createEventListeners()
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-webextension-mock",
-  "version": "3.9.0",
+  "version": "4.0.0",
   "description": "Mock the components of a WebExtension",
   "main": "dist/setup.js",
   "module": "src/setup.js",
@@ -18,20 +18,19 @@
     "eslint-check": "eslint --print-config .eslintrc.js | eslint-config-prettier-check"
   },
   "devDependencies": {
-    "@babel/core": "^7.11.6",
-    "@babel/preset-env": "^7.11.5",
-    "@changesets/cli": "^2.27.1",
-    "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^26.5.2",
-    "eslint": "^7.11.0",
-    "eslint-config-prettier": "^6.12.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "jest": "^26.5.3",
-    "prettier": "^2.1.2",
-    "rollup": "^2.30.0",
+    "@babel/core": "^7.25.8",
+    "@babel/preset-env": "^7.25.8",
+    "@changesets/cli": "^2.27.9",
+    "babel-jest": "^29.7.0",
+    "eslint": "^9.13.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "jest": "^29.7.0",
+    "prettier": "^3.3.3",
+    "rollup": "^2.79.2",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-watch": "^4.0.0"
+    "rollup-watch": "^4.3.1"
   },
   "jest": {
     "bail": true,

package/src/storage.js

@@ -1,157 +1,40 @@
 import { createEventListeners } from './createEventListeners';
 
-let syncStore = {};
-let localStore = {};
-let managedStore = {};
-let sessionStore = {};
-
 function resolveKey(key, store) {
   if (typeof key === 'string') {
-    const result = {};
-    result[key] = store[key];
-    return result;
+    if (key in store) {
+      return { key: store[key] };
+    } else {
+      return {};
+    }
   } else if (Array.isArray(key)) {
-    return key.reduce((acc, curr) => {
-      acc[curr] = store[curr];
-      return acc;
-    }, {});
+    return key.reduce(
+      (acc, currKey) => ({
+        ...acc,
+        ...resolveKey(currKey, store),
+      }),
+      {}
+    );
   } else if (typeof key === 'object') {
-    return Object.keys(key).reduce((acc, curr) => {
-      acc[curr] = store[curr] || key[curr];
-      return acc;
-    }, {});
+    return Object.entries(key).reduce(
+      (acc, [currKey, fallbackValue]) => ({
+        ...acc,
+        [currKey]: fallbackValue,
+        ...resolveKey(currKey, store),
+      }),
+      {}
+    );
   }
   throw new Error('Wrong key given');
 }
 
-export const storage = {
-  sync: {
-    get: jest.fn((id, cb) => {
-      const result =
-        id === null || id === undefined ? syncStore : resolveKey(id, syncStore);
-      if (cb !== undefined) {
-        return cb(result);
-      }
-      return Promise.resolve(result);
-    }),
-    getBytesInUse: jest.fn((id, cb) => {
-      if (cb !== undefined) {
-        return cb(0);
-      }
-      return Promise.resolve(0);
-    }),
-    set: jest.fn((payload, cb) => {
-      Object.keys(payload).forEach((key) => (syncStore[key] = payload[key]));
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    remove: jest.fn((id, cb) => {
-      const keys = typeof id === 'string' ? [id] : id;
-      keys.forEach((key) => delete syncStore[key]);
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    clear: jest.fn((cb) => {
-      syncStore = {};
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    onChanged: createEventListeners(),
-  },
-  local: {
-    get: jest.fn((id, cb) => {
-      const result =
-        id === null || id === undefined
-          ? localStore
-          : resolveKey(id, localStore);
-      if (cb !== undefined) {
-        return cb(result);
-      }
-      return Promise.resolve(result);
-    }),
-    getBytesInUse: jest.fn((id, cb) => {
-      if (cb !== undefined) {
-        return cb(0);
-      }
-      return Promise.resolve(0);
-    }),
-    set: jest.fn((payload, cb) => {
-      Object.keys(payload).forEach((key) => (localStore[key] = payload[key]));
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    remove: jest.fn((id, cb) => {
-      const keys = typeof id === 'string' ? [id] : id;
-      keys.forEach((key) => delete localStore[key]);
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    clear: jest.fn((cb) => {
-      localStore = {};
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    onChanged: createEventListeners(),
-  },
-  session: {
-    get: jest.fn((id, cb) => {
-      const result =
-        id === null || id === undefined
-          ? localStore
-          : resolveKey(id, localStore);
-      if (cb !== undefined) {
-        return cb(result);
-      }
-      return Promise.resolve(result);
-    }),
-    getBytesInUse: jest.fn((id, cb) => {
-      if (cb !== undefined) {
-        return cb(0);
-      }
-      return Promise.resolve(0);
-    }),
-    set: jest.fn((payload, cb) => {
-      Object.keys(payload).forEach((key) => (localStore[key] = payload[key]));
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    remove: jest.fn((id, cb) => {
-      const keys = typeof id === 'string' ? [id] : id;
-      keys.forEach((key) => delete localStore[key]);
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    clear: jest.fn((cb) => {
-      localStore = {};
-      if (cb !== undefined) {
-        return cb();
-      }
-      return Promise.resolve();
-    }),
-    onChanged: createEventListeners(),
-  },
-  managed: {
+function mockStore() {
+  const store = {};
+
+  return {
     get: jest.fn((id, cb) => {
       const result =
-        id === null || id === undefined
-          ? managedStore
-          : resolveKey(id, managedStore);
+        id === null || id === undefined ? store : resolveKey(id, store);
       if (cb !== undefined) {
         return cb(result);
       }
@@ -164,7 +47,7 @@ export const storage = {
       return Promise.resolve(0);
     }),
     set: jest.fn((payload, cb) => {
-      Object.keys(payload).forEach((key) => (managedStore[key] = payload[key]));
+      Object.keys(payload).forEach((key) => (store[key] = payload[key]));
       if (cb !== undefined) {
         return cb();
       }
@@ -172,20 +55,27 @@ export const storage = {
     }),
     remove: jest.fn((id, cb) => {
       const keys = typeof id === 'string' ? [id] : id;
-      keys.forEach((key) => delete managedStore[key]);
+      keys.forEach((key) => delete store[key]);
       if (cb !== undefined) {
         return cb();
       }
       return Promise.resolve();
     }),
     clear: jest.fn((cb) => {
-      managedStore = {};
+      Object.keys(store).forEach((key) => delete store[key]);
       if (cb !== undefined) {
         return cb();
       }
       return Promise.resolve();
     }),
     onChanged: createEventListeners(),
-  },
+  };
+}
+
+export const storage = {
+  sync: mockStore(),
+  local: mockStore(),
+  session: mockStore(),
+  managed: mockStore(),
   onChanged: createEventListeners(),
 };