diff --git a/src/app-menu/index.js b/src/app-menu/index.js index 4341e8cd..be8e4dd3 100644 --- a/src/app-menu/index.js +++ b/src/app-menu/index.js @@ -24,7 +24,11 @@ const webPreferences = { preload: path.resolve(__dirname, '..', '..', 'bundles', 'app-menu.preload.js') }; -const initAppMenu = () => { +/** + * Creates a new BrowserView instance with the App Menu + * @returns {Electron.CrossProcessExports.BrowserView} + */ +const newAppMenu = () => { const appMenu = new BrowserView({webPreferences}); appMenu.isAppMenu = true; appMenu.setAutoResize({width: false, horizontal: false, height: false, vertical: false}); @@ -34,4 +38,4 @@ const initAppMenu = () => { const isNotAppMenu = bv => bv.isAppMenu !== true; -module.exports = {initAppMenu, isNotAppMenu}; +module.exports = {newAppMenu, isNotAppMenu}; diff --git a/src/main/__tests__/index.test.js b/src/main/__tests__/index.test.js index 7c594d3d..f35d9a67 100644 --- a/src/main/__tests__/index.test.js +++ b/src/main/__tests__/index.test.js @@ -56,7 +56,7 @@ describe('Main module test suite', () => { nativeTheme: mockNativeTheme })); appMenuModule = require('../../app-menu'); - jest.spyOn(appMenuModule, 'initAppMenu'); + jest.spyOn(appMenuModule, 'newAppMenu'); settingsModule = require('../../settings'); jest.spyOn(settingsModule, 'loadSettings').mockImplementation(() => mockSettings); jest.spyOn(settingsModule, 'updateSettings').mockImplementation(); @@ -179,7 +179,7 @@ describe('Main module test suite', () => { mockAppMenu = { setBounds: jest.fn() }; - jest.spyOn(appMenuModule, 'initAppMenu').mockImplementation(() => mockAppMenu); + jest.spyOn(appMenuModule, 'newAppMenu').mockImplementation(() => mockAppMenu); main.init(); }); test('should set app-menu bounds', () => { @@ -498,7 +498,7 @@ describe('Main module test suite', () => { test('appMenuOpen, should show and resize app-menu', () => { // Given const mockAppMenu = {setBounds: jest.fn()}; - jest.spyOn(appMenuModule, 'initAppMenu').mockImplementation(() => mockAppMenu); + jest.spyOn(appMenuModule, 'newAppMenu').mockImplementation(() => mockAppMenu); main.init(); // When mockIpc.listeners.appMenuOpen(); @@ -510,7 +510,7 @@ describe('Main module test suite', () => { test('appMenuClose, should hide app-menu', () => { // Given const mockAppMenu = {isTheMockAppMenu: true}; - jest.spyOn(appMenuModule, 'initAppMenu').mockImplementation(() => mockAppMenu); + jest.spyOn(appMenuModule, 'newAppMenu').mockImplementation(() => mockAppMenu); main.init(); // When mockIpc.listeners.appMenuClose(); diff --git a/src/main/index.js b/src/main/index.js index 51f2ba4c..59170d9a 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -15,7 +15,7 @@ */ const {BrowserWindow, Notification, app, desktopCapturer, ipcMain: ipc, nativeTheme} = require('electron'); const {APP_EVENTS} = require('../constants'); -const {initAppMenu, isNotAppMenu} = require('../app-menu'); +const {newAppMenu, isNotAppMenu} = require('../app-menu'); const {TABS_CONTAINER_HEIGHT, initTabContainer, isNotTabContainer} = require('../chrome-tabs'); const {openHelpDialog} = require('../help'); const {loadSettings, updateSettings, openSettingsDialog} = require('../settings'); @@ -201,7 +201,7 @@ const initGlobalListeners = () => { const browserVersionsReady = () => { app.userAgentFallback = userAgentForView(mainWindow); tabContainer = initTabContainer(); - appMenu = initAppMenu(); + appMenu = newAppMenu(); }; const init = () => {