feat(base-window): preload.keyboard-shortcuts.js reusable in all WebViews (#683)

Author: manusa

…sts__/preload.keyboard-shortcuts.test.js …sts__/preload.keyboard-shortcuts.test.jssrc/service-manager/__tests__/preload.keyboard-shortcuts.test.js renamed to src/base-window/__tests__/preload.keyboard-shortcuts.test.js src/service-manager/__tests__/preload.keyboard-shortcuts.test.js renamed to src/base-window/__tests__/preload.keyboard-shortcuts.test.js

@@ -44,6 +44,51 @@ describe('Browser Keyboard Shortcuts test suite', () => {
     });
   });
   describe('Control modified events', () => {
+    test('ctrl+R, should send reload app event', () => {
+      // Given
+      browserKeyboardShortcuts.initKeyboardShortcuts();
+      // When
+      globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: 'R', ctrlKey: true}));
+      // Then
+      expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
+      expect(electron.ipcRenderer.send).toHaveBeenCalledWith('reload');
+    });
+    test('ctrl+r (lowercase), should send reload app event', () => {
+      // Given
+      browserKeyboardShortcuts.initKeyboardShortcuts();
+      // When
+      globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: 'r', ctrlKey: true}));
+      // Then
+      expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
+      expect(electron.ipcRenderer.send).toHaveBeenCalledWith('reload');
+    });
+    test('ctrl++ (zoom in), should send zoomIn event', () => {
+      // Given
+      browserKeyboardShortcuts.initKeyboardShortcuts();
+      // When
+      globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: '+', ctrlKey: true}));
+      // Then
+      expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
+      expect(electron.ipcRenderer.send).toHaveBeenCalledWith('zoomIn');
+    });
+    test('ctrl+- (zoom out), should send zoomOut event', () => {
+      // Given
+      browserKeyboardShortcuts.initKeyboardShortcuts();
+      // When
+      globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: '-', ctrlKey: true}));
+      // Then
+      expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
+      expect(electron.ipcRenderer.send).toHaveBeenCalledWith('zoomOut');
+    });
+    test('ctrl+0 (zoom reset), should send zoomReset event', () => {
+      // Given
+      browserKeyboardShortcuts.initKeyboardShortcuts();
+      // When
+      globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: '0', ctrlKey: true}));
+      // Then
+      expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
+      expect(electron.ipcRenderer.send).toHaveBeenCalledWith('zoomReset');
+    });
     test('ctrl+unrecognized_key, should NOT send any app event', () => {
       // Given
       browserKeyboardShortcuts.initKeyboardShortcuts();
@@ -63,6 +108,15 @@ describe('Browser Keyboard Shortcuts test suite', () => {
       expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
       expect(electron.ipcRenderer.send).toHaveBeenCalledWith('reload');
     });
+    test('cmd+r (lowercase), should send reload app event', () => {
+      // Given
+      browserKeyboardShortcuts.initKeyboardShortcuts();
+      // When
+      globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: 'r', metaKey: true}));
+      // Then
+      expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
+      expect(electron.ipcRenderer.send).toHaveBeenCalledWith('reload');
+    });
   });
   describe('Mouse wheel events', () => {
     test('ctrl+scrollUp, should send zoomIn event', () => {

…ce-manager/preload.keyboard-shortcuts.js …ase-window/preload.keyboard-shortcuts.jssrc/service-manager/preload.keyboard-shortcuts.js renamed to src/base-window/preload.keyboard-shortcuts.js src/service-manager/preload.keyboard-shortcuts.js renamed to src/base-window/preload.keyboard-shortcuts.js

@@ -14,3 +14,4 @@
    limitations under the License.
  */
 require('./preload.webstore-private');
+require('../base-window/preload.keyboard-shortcuts').initKeyboardShortcuts();

src/chrome-extensions/preload.js

@@ -30,7 +30,7 @@ describe('Service Manager Module preload test suite', () => {
   });
   describe('preload', () => {
     beforeEach(() => {
-      jest.spyOn(require('../preload.keyboard-shortcuts'), 'initKeyboardShortcuts');
+      jest.spyOn(require('../../base-window/preload.keyboard-shortcuts'), 'initKeyboardShortcuts');
       jest.spyOn(require('../preload.spell-check'), 'initSpellChecker');
     });
     test('adds required libraries', async () => {
@@ -39,7 +39,7 @@ describe('Service Manager Module preload test suite', () => {
       // Then
       expect(globalThis.Notification).toEqual(expect.any(Function));
       expect(globalThis.navigator.mediaDevices.getDisplayMedia).toEqual(expect.any(Function));
-      expect(require('../preload.keyboard-shortcuts').initKeyboardShortcuts).toHaveBeenCalledTimes(1);
+      expect(require('../../base-window/preload.keyboard-shortcuts').initKeyboardShortcuts).toHaveBeenCalledTimes(1);
       await waitFor(() => expect(mockElectron.webFrame.setSpellCheckProvider).toHaveBeenCalledTimes(1));
       expect(require('../preload.spell-check').initSpellChecker).toHaveBeenCalledTimes(1);
     });

src/service-manager/__tests__/preload.test.js

@@ -15,7 +15,7 @@
  */
 require('./preload.notification-shim');
 require('./preload.mediadevices-shim');
-require('./preload.keyboard-shortcuts').initKeyboardShortcuts();
+require('../base-window/preload.keyboard-shortcuts').initKeyboardShortcuts();
 require('./preload.spell-check').initSpellChecker()
   .catch(err => console.error('Error initializing spell check', err));