mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
200 lines
6.6 KiB
JavaScript
200 lines
6.6 KiB
JavaScript
const { app, protocol } = require('electron');
|
|
|
|
const fs = require('node:fs');
|
|
const path = require('node:path');
|
|
const v8 = require('node:v8');
|
|
|
|
const FAILURE_STATUS_KEY = 'Electron_Spec_Runner_Failures';
|
|
|
|
// We want to terminate on errors, not throw up a dialog
|
|
process.on('uncaughtException', (err) => {
|
|
console.error('Unhandled exception in main spec runner:', err);
|
|
process.exit(1);
|
|
});
|
|
|
|
// Tell ts-node which tsconfig to use
|
|
process.env.TS_NODE_PROJECT = path.resolve(__dirname, '../tsconfig.spec.json');
|
|
process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = 'true';
|
|
|
|
// Some Linux machines have broken hardware acceleration support.
|
|
if (process.env.ELECTRON_TEST_DISABLE_HARDWARE_ACCELERATION) {
|
|
app.disableHardwareAcceleration();
|
|
}
|
|
|
|
v8.setFlagsFromString('--expose_gc');
|
|
app.commandLine.appendSwitch('js-flags', '--expose_gc');
|
|
// Prevent the spec runner quitting when the first window closes
|
|
app.on('window-all-closed', () => null);
|
|
|
|
// Use fake device for Media Stream to replace actual camera and microphone.
|
|
app.commandLine.appendSwitch('use-fake-device-for-media-stream');
|
|
app.commandLine.appendSwitch('host-resolver-rules', [
|
|
'MAP localhost2 127.0.0.1',
|
|
'MAP ipv4.localhost2 10.0.0.1',
|
|
'MAP ipv6.localhost2 [::1]',
|
|
'MAP notfound.localhost2 ~NOTFOUND'
|
|
].join(', '));
|
|
|
|
// Enable features required by tests.
|
|
app.commandLine.appendSwitch('enable-features', [
|
|
// spec/api-web-frame-main-spec.ts
|
|
'DocumentPolicyIncludeJSCallStacksInCrashReports',
|
|
// spec/spellchecker-spec.ts - allows spellcheck without user gesture
|
|
// https://chromium-review.googlesource.com/c/chromium/src/+/7452579
|
|
'UnrestrictSpellingAndGrammarForTesting'
|
|
].join(','));
|
|
|
|
global.standardScheme = 'app';
|
|
global.zoomScheme = 'zoom';
|
|
global.serviceWorkerScheme = 'sw';
|
|
protocol.registerSchemesAsPrivileged([
|
|
{ scheme: global.standardScheme, privileges: { standard: true, secure: true, stream: false } },
|
|
{ scheme: global.zoomScheme, privileges: { standard: true, secure: true } },
|
|
{ scheme: global.serviceWorkerScheme, privileges: { allowServiceWorkers: true, standard: true, secure: true } },
|
|
{ scheme: 'http-like', privileges: { standard: true, secure: true, corsEnabled: true, supportFetchAPI: true } },
|
|
{ scheme: 'cors-blob', privileges: { corsEnabled: true, supportFetchAPI: true } },
|
|
{ scheme: 'cors', privileges: { corsEnabled: true, supportFetchAPI: true } },
|
|
{ scheme: 'no-cors', privileges: { supportFetchAPI: true } },
|
|
{ scheme: 'no-fetch', privileges: { corsEnabled: true } },
|
|
{ scheme: 'stream', privileges: { standard: true, stream: true } },
|
|
{ scheme: 'foo', privileges: { standard: true } },
|
|
{ scheme: 'bar', privileges: { standard: true } }
|
|
]);
|
|
|
|
app.whenReady().then(async () => {
|
|
require('ts-node/register');
|
|
|
|
const argv = require('yargs')
|
|
.boolean('ci')
|
|
.array('files')
|
|
.string('g').alias('g', 'grep')
|
|
.boolean('i').alias('i', 'invert')
|
|
.argv;
|
|
|
|
const Mocha = require('mocha');
|
|
const mochaOptions = {
|
|
forbidOnly: process.env.CI
|
|
};
|
|
if (process.env.CI) {
|
|
mochaOptions.retries = 3;
|
|
}
|
|
if (process.env.MOCHA_REPORTER) {
|
|
mochaOptions.reporter = process.env.MOCHA_REPORTER;
|
|
}
|
|
if (process.env.MOCHA_MULTI_REPORTERS) {
|
|
mochaOptions.reporterOptions = {
|
|
reporterEnabled: process.env.MOCHA_MULTI_REPORTERS
|
|
};
|
|
}
|
|
// The MOCHA_GREP and MOCHA_INVERT are used in some vendor builds for sharding
|
|
// tests.
|
|
if (process.env.MOCHA_GREP) {
|
|
mochaOptions.grep = process.env.MOCHA_GREP;
|
|
}
|
|
if (process.env.MOCHA_INVERT) {
|
|
mochaOptions.invert = process.env.MOCHA_INVERT === 'true';
|
|
}
|
|
const mocha = new Mocha(mochaOptions);
|
|
|
|
// Add a root hook on mocha to skip any tests that are disabled
|
|
const disabledTests = new Set(
|
|
JSON.parse(
|
|
fs.readFileSync(path.join(__dirname, 'disabled-tests.json'), 'utf8')
|
|
)
|
|
);
|
|
mocha.suite.beforeEach(function () {
|
|
// TODO(clavin): add support for disabling *suites* by title, not just tests
|
|
if (disabledTests.has(this.currentTest?.fullTitle())) {
|
|
this.skip();
|
|
}
|
|
});
|
|
|
|
// The cleanup method is registered this way rather than through an
|
|
// `afterEach` at the top level so that it can run before other `afterEach`
|
|
// methods.
|
|
//
|
|
// The order of events is:
|
|
// 1. test completes,
|
|
// 2. `defer()`-ed methods run, in reverse order,
|
|
// 3. regular `afterEach` hooks run.
|
|
const { runCleanupFunctions } = require('./lib/spec-helpers');
|
|
mocha.suite.on('suite', function attach (suite) {
|
|
suite.afterEach('cleanup', runCleanupFunctions);
|
|
suite.on('suite', attach);
|
|
});
|
|
|
|
if (!process.env.MOCHA_REPORTER) {
|
|
mocha.ui('bdd').reporter('tap');
|
|
}
|
|
const mochaTimeout = process.env.MOCHA_TIMEOUT || 30000;
|
|
mocha.timeout(mochaTimeout);
|
|
|
|
if (argv.grep) mocha.grep(argv.grep);
|
|
if (argv.invert) mocha.invert();
|
|
|
|
const baseElectronDir = path.resolve(__dirname, '..');
|
|
const validTestPaths = argv.files && argv.files.map(file =>
|
|
path.isAbsolute(file)
|
|
? path.relative(baseElectronDir, file)
|
|
: path.normalize(file));
|
|
const filter = (file) => {
|
|
if (!/-spec\.[tj]s$/.test(file)) {
|
|
return false;
|
|
}
|
|
|
|
// This allows you to run specific modules only:
|
|
// npm run test -match=menu
|
|
const moduleMatch = process.env.npm_config_match
|
|
? new RegExp(process.env.npm_config_match, 'g')
|
|
: null;
|
|
if (moduleMatch && !moduleMatch.test(file)) {
|
|
return false;
|
|
}
|
|
|
|
if (validTestPaths && !validTestPaths.includes(path.relative(baseElectronDir, file))) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
};
|
|
|
|
const { getFiles } = require('./get-files');
|
|
const testFiles = await getFiles(__dirname, filter);
|
|
for (const file of testFiles.sort()) {
|
|
mocha.addFile(file);
|
|
}
|
|
|
|
if (validTestPaths && validTestPaths.length > 0 && testFiles.length === 0) {
|
|
console.error('Test files were provided, but they did not match any searched files');
|
|
console.error('provided file paths (relative to electron/):', validTestPaths);
|
|
process.exit(1);
|
|
}
|
|
|
|
const cb = () => {
|
|
// Ensure the callback is called after runner is defined
|
|
process.nextTick(() => {
|
|
if (process.env.ELECTRON_FORCE_TEST_SUITE_EXIT === 'true') {
|
|
console.log(`${FAILURE_STATUS_KEY}: ${runner.failures}`);
|
|
process.kill(process.pid);
|
|
} else {
|
|
process.exit(runner.failures);
|
|
}
|
|
});
|
|
};
|
|
|
|
// Set up chai in the correct order
|
|
const chai = require('chai');
|
|
chai.use(require('chai-as-promised'));
|
|
chai.use(require('dirty-chai'));
|
|
|
|
// Show full object diff
|
|
// https://github.com/chaijs/chai/issues/469
|
|
chai.config.truncateThreshold = 0;
|
|
|
|
const runner = mocha.run(cb);
|
|
}).catch((err) => {
|
|
console.error('An error occurred while running the spec runner');
|
|
console.error(err);
|
|
process.exit(1);
|
|
});
|