Skip to content

Commit

Permalink
⬆ Bump electron to 32.2.6
Browse files Browse the repository at this point in the history
Signed-off-by: Marc Nuri <[email protected]>
  • Loading branch information
manusa committed Dec 2, 2024
1 parent f74a425 commit f7cec07
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ electronim
## Features

- ⚛ Multi-platform: ElectronIM is available for Linux 🐧, Mac 🍏 and Windows.
- 🌍 Based on Chromium 126
- 🌍 Based on Chromium 128
- 🔔 Desktop notifications: ElectronIM will notify you using your native system notifications.
- 🧐 Spellchecker: ElectronIM contains spellchecker dictionaries for many languages,
if your language is not supported, just [file an issue](https://github.com/manusa/electronim/issues/new).
Expand Down
2 changes: 1 addition & 1 deletion build-config/electronim.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Improve your productivity by combining all your instant messaging applications (
### Features

- ⚛ Multi-platform: ElectronIM is available for Linux 🐧, Mac 🍏 and Windows.
- 🌍 Based on Chromium 126
- 🌍 Based on Chromium 128
- 🔔 Desktop notifications: ElectronIM will notify you using your native system notifications.
- 🧐 Spellchecker: ElectronIM contains spellchecker dictionaries for many languages,
if your language is not supported, just [file an issue](https://github.com/manusa/electronim/issues/new).
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
"dictionary-sv": "^3.0.1",
"dictionary-tr": "^1.3.3",
"dictionary-uk": "^2.1.1",
"electron": "31.7.5",
"electron": "32.2.6",
"htm": "3.1.1",
"markdown-it": "14.1.0",
"nodehun": "3.0.2",
Expand Down
4 changes: 3 additions & 1 deletion src/__tests__/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@ const mockWebContentsViewInstance = () => {
executeJavaScript: jest.fn(async () => {}),
focus: jest.fn(),
getURL: jest.fn(),
goBack: jest.fn(),
loadURL: jest.fn(url => {
instance.webContents.loadedUrl = url;
}),
navigationHistory: {
goBack: jest.fn()
},
on: jest.fn((...args) => instance.on(...args)),
openDevTools: jest.fn(),
paste: jest.fn(),
Expand Down
6 changes: 3 additions & 3 deletions src/tab-manager/__tests__/context-menu.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('Tab Manager context-menu test suite', () => {
}));
jest.mock('../../spell-check');
electron = require('electron');
electron.webContentsViewInstance.webContents.canGoBack = jest.fn(() => false);
electron.webContentsViewInstance.webContents.navigationHistory.canGoBack = jest.fn(() => false);
listeners = electron.webContentsViewInstance.listeners;
event = new Event('');
params = {x: 13, y: 37};
Expand Down Expand Up @@ -122,7 +122,7 @@ describe('Tab Manager context-menu test suite', () => {
}));
});
test('enabled when canGoBack returns true', async () => {
electron.webContentsViewInstance.webContents.canGoBack = jest.fn(() => true);
electron.webContentsViewInstance.webContents.navigationHistory.canGoBack = jest.fn(() => true);
await listeners['context-menu'](event, params);
expect(electron.MenuItem).toHaveBeenCalledWith(expect.objectContaining({
enabled: false,
Expand All @@ -133,7 +133,7 @@ describe('Tab Manager context-menu test suite', () => {
// When
electron.MenuItem.mock.calls.filter(c => c[0].label === 'Back')[0][0].click();
// Then
expect(electron.webContentsViewInstance.webContents.goBack).toHaveBeenCalledTimes(1);
expect(electron.webContentsViewInstance.webContents.navigationHistory.goBack).toHaveBeenCalledTimes(1);
});
});
test('Reload click, should trigger reload', async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/tab-manager/context-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ const entries = ({webContents, params}) => {
return [
[{
label: 'Back',
enabled: webContents.canGoBack(),
click: () => webContents.goBack()
enabled: webContents.navigationHistory.canGoBack(),
click: () => webContents.navigationHistory.goBack()
}, {
label: 'Reload',
click: () => webContents.reload()
Expand Down

0 comments on commit f7cec07

Please sign in to comment.