ccd4531bfb
* chore: bump chromium in DEPS to 117.0.5846.0 * chore: update patches * 4628901: Bump the macOS deployment target to 10.15 https://chromium-review.googlesource.com/c/chromium/src/+/4628901 * 4593350: [Private Network Access] Trigger Permission Prompt https://chromium-review.googlesource.com/c/chromium/src/+/4593350 * 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs https://chromium-review.googlesource.com/c/chromium/src/+/4631011 * chore: disable API deprecation warnings in NSKeyedArchiver * chore: update libcxx filenames * chore: bump chromium in DEPS to 117.0.5848.2 * chore: update feat_add_set_theme_source_to_allow_apps_to.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629743 No manual changes; patch succeeded with fuzz * chore: update process_singleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4605398 Trivial manual patch adjustments to account for code shear. * chore: remove electron::BrowserContext::GetMediaDeviceIDSalt() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4608130 upstream tldr: - content::BrowserContext::GetMediaDeviceIDSalt() - content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed() + content::ContentBrowserClient::GetMediaDeviceIDSalt() This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in place (now non-virtual, non-override). It is now called by the new function ElectronBrowserClient::GetMediaDeviceIDSalt(). As a followup, we might want to consider using the new upstream media_device_salt::MediaDeviceSaltService and removing our electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd opinion since he has done the most work on MediaDeviceIDSalt and may have more context. * chore: fix iwyu breakage Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629624 electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't include it. Things worked anyway because we got it indirectly from content/public/browser/web_contents.h until 4629624. * chore: remove call to base::mac::IsAtLeastOS10_14 upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in IAP upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in electron_application_delegate upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch Upstream has bumped minimum to macOS 10.15 * chore: remove @available(macOS 10.14) check Upstream minimum requirement for macOS is now 10.15 * chore: update patches * chore: bump chromium in DEPS to 117.0.5850.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5852.0 * chore: update patches * Move two params from NetworkContextParams to NetworkContextFilePaths. https://chromium-review.googlesource.com/c/chromium/src/+/4615930 * WebUSB: Add exclusionFilters to USBRequestDeviceOptions https://chromium-review.googlesource.com/c/chromium/src/+/4614682 * Convert /chrome/browser/ui to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4615920 * fixup! Bump the macOS deployment target to 10.15 * fixup! Bump the macOS deployment target to 10.15 * chore: update libcxx files * win: Remove 10Glass from Windows10Glass function and var names https://chromium-review.googlesource.com/c/chromium/src/+/4641314 * chore: revert 392e5f43 from chromium * Add an ExecutionContext to ScriptState https://chromium-review.googlesource.com/c/chromium/src/+/4609446 * fixup! Add an ExecutionContext to ScriptState * chore: fix header * Revert "chore: revert 392e5f43 from chromium" This reverts commit b7f782943e4ce83cae8cd35780d8d3618cf0772c. * fix: return correct min/max sizes in WinFrameView * fixup! Revert chore: revert 392e5f43 from chromium * fixup! Add an ExecutionContext to ScriptState * Revert "fixup! Revert chore: revert 392e5f43 from chromium" This reverts commit 7e2c7281abfc4f309255339fdba073d90a9ae3eb. * Revert "fix: return correct min/max sizes in WinFrameView" This reverts commit 3f418b1ab5155686730e087ae6cabe4a21b4bb61. * Revert "Revert "chore: revert 392e5f43 from chromium"" This reverts commit 56296d8b7c434147e032e3c3b08c0e371b6c27ba. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
118 lines
4.4 KiB
TypeScript
118 lines
4.4 KiB
TypeScript
import { expect } from 'chai';
|
|
import { nativeTheme, systemPreferences, BrowserWindow, ipcMain } from 'electron/main';
|
|
import { once } from 'node:events';
|
|
import * as path from 'node:path';
|
|
import { setTimeout } from 'node:timers/promises';
|
|
|
|
import { ifdescribe } from './lib/spec-helpers';
|
|
import { closeAllWindows } from './lib/window-helpers';
|
|
|
|
describe('nativeTheme module', () => {
|
|
describe('nativeTheme.shouldUseDarkColors', () => {
|
|
it('returns a boolean', () => {
|
|
expect(nativeTheme.shouldUseDarkColors).to.be.a('boolean');
|
|
});
|
|
});
|
|
|
|
describe('nativeTheme.themeSource', () => {
|
|
afterEach(async () => {
|
|
nativeTheme.themeSource = 'system';
|
|
// Wait for any pending events to emit
|
|
await setTimeout(20);
|
|
|
|
closeAllWindows();
|
|
});
|
|
|
|
it('is system by default', () => {
|
|
expect(nativeTheme.themeSource).to.equal('system');
|
|
});
|
|
|
|
it('should override the value of shouldUseDarkColors', () => {
|
|
nativeTheme.themeSource = 'dark';
|
|
expect(nativeTheme.shouldUseDarkColors).to.equal(true);
|
|
nativeTheme.themeSource = 'light';
|
|
expect(nativeTheme.shouldUseDarkColors).to.equal(false);
|
|
});
|
|
|
|
it('should emit the "updated" event when it is set and the resulting "shouldUseDarkColors" value changes', async () => {
|
|
nativeTheme.themeSource = 'light';
|
|
let updatedEmitted = once(nativeTheme, 'updated');
|
|
nativeTheme.themeSource = 'dark';
|
|
await updatedEmitted;
|
|
updatedEmitted = once(nativeTheme, 'updated');
|
|
nativeTheme.themeSource = 'light';
|
|
await updatedEmitted;
|
|
});
|
|
|
|
it('should not emit the "updated" event when it is set and the resulting "shouldUseDarkColors" value is the same', async () => {
|
|
nativeTheme.themeSource = 'dark';
|
|
// Wait a few ticks to allow an async events to flush
|
|
await setTimeout(20);
|
|
let called = false;
|
|
nativeTheme.once('updated', () => {
|
|
called = true;
|
|
});
|
|
nativeTheme.themeSource = 'dark';
|
|
// Wait a few ticks to allow an async events to flush
|
|
await setTimeout(20);
|
|
expect(called).to.equal(false);
|
|
});
|
|
|
|
ifdescribe(process.platform === 'darwin')('on macOS', () => {
|
|
it('should update appLevelAppearance when set', () => {
|
|
nativeTheme.themeSource = 'dark';
|
|
expect(systemPreferences.appLevelAppearance).to.equal('dark');
|
|
nativeTheme.themeSource = 'light';
|
|
expect(systemPreferences.appLevelAppearance).to.equal('light');
|
|
});
|
|
});
|
|
|
|
const getPrefersColorSchemeIsDark = async (w: Electron.BrowserWindow) => {
|
|
const isDark: boolean = await w.webContents.executeJavaScript(
|
|
'matchMedia("(prefers-color-scheme: dark)").matches'
|
|
);
|
|
return isDark;
|
|
};
|
|
|
|
it('should override the result of prefers-color-scheme CSS media query', async () => {
|
|
const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: false, nodeIntegration: true } });
|
|
await w.loadFile(path.resolve(__dirname, 'fixtures', 'blank.html'));
|
|
await w.webContents.executeJavaScript(`
|
|
window.matchMedia('(prefers-color-scheme: dark)')
|
|
.addEventListener('change', () => require('electron').ipcRenderer.send('theme-change'))
|
|
`);
|
|
const originalSystemIsDark = await getPrefersColorSchemeIsDark(w);
|
|
let changePromise = once(ipcMain, 'theme-change');
|
|
nativeTheme.themeSource = 'dark';
|
|
if (!originalSystemIsDark) await changePromise;
|
|
expect(await getPrefersColorSchemeIsDark(w)).to.equal(true);
|
|
changePromise = once(ipcMain, 'theme-change');
|
|
nativeTheme.themeSource = 'light';
|
|
await changePromise;
|
|
expect(await getPrefersColorSchemeIsDark(w)).to.equal(false);
|
|
changePromise = once(ipcMain, 'theme-change');
|
|
nativeTheme.themeSource = 'system';
|
|
if (originalSystemIsDark) await changePromise;
|
|
expect(await getPrefersColorSchemeIsDark(w)).to.equal(originalSystemIsDark);
|
|
w.close();
|
|
});
|
|
});
|
|
|
|
describe('nativeTheme.shouldUseInvertedColorScheme', () => {
|
|
it('returns a boolean', () => {
|
|
expect(nativeTheme.shouldUseInvertedColorScheme).to.be.a('boolean');
|
|
});
|
|
});
|
|
|
|
describe('nativeTheme.shouldUseHighContrastColors', () => {
|
|
it('returns a boolean', () => {
|
|
expect(nativeTheme.shouldUseHighContrastColors).to.be.a('boolean');
|
|
});
|
|
});
|
|
|
|
describe('nativeTheme.inForcedColorsMode', () => {
|
|
it('returns a boolean', () => {
|
|
expect(nativeTheme.inForcedColorsMode).to.be.a('boolean');
|
|
});
|
|
});
|
|
});
|