mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 2

fix: Add .paks for media-internals and webrtc-internals pages (#24010)

Browse source 
* fix: adds paks for media-internals and webrtc-internals pages

* adds tests
This commit is contained in:
Gellert Hegyi 2020-06-11 04:07:49 +02:00 • committed by GitHub
parent b1574f9e59
commit ce042184de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
electron_paks.gni
View file

@ -55,7 +55,9 @@ template("electron_extra_paks") {
output = "${invoker.output_dir}/resources.pak" output = "${invoker.output_dir}/resources.pak"
sources = [ sources = [
"$root_gen_dir/components/components_resources.pak", "$root_gen_dir/components/components_resources.pak",
"$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
"$root_gen_dir/content/browser/tracing/tracing_resources.pak", "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
"$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
"$root_gen_dir/content/content_resources.pak", "$root_gen_dir/content/content_resources.pak",
"$root_gen_dir/content/dev_ui_content_resources.pak", "$root_gen_dir/content/dev_ui_content_resources.pak",
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
@ -68,7 +70,9 @@ template("electron_extra_paks") {
"//components/resources", "//components/resources",
"//content:content_resources", "//content:content_resources",
"//content:dev_ui_content_resources", "//content:dev_ui_content_resources",
"//content/browser/resources/media:media_internals_resources",
"//content/browser/tracing:resources", "//content/browser/tracing:resources",
"//content/browser/webrtc/resources",
"//electron:resources", "//electron:resources",
"//mojo/public/js:resources", "//mojo/public/js:resources",
"//net:net_resources", "//net:net_resources",

24
spec-main/chromium-spec.ts
View file

@ -1122,7 +1122,7 @@ describe('chromium features', () => {
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
try { try {
let req = window.indexedDB.open('${dbName}'); let req = window.indexedDB.open('${dbName}');
req.onsuccess = (event) => { req.onsuccess = (event) => {
let db = req.result; let db = req.result;
resolve(db.name); resolve(db.name);
} }
@ -1266,6 +1266,28 @@ describe('chromium features', () => {
}); });
}); });
}); });
describe('chrome://media-internals', () => {
it('loads the page successfully', async () => {
const w = new BrowserWindow({ show: false });
w.loadURL('chrome://media-internals');
const pageExists = await w.webContents.executeJavaScript(
"window.hasOwnProperty('chrome') && window.chrome.hasOwnProperty('send')"
);
expect(pageExists).to.be.true();
});
});
describe('chrome://webrtc-internals', () => {
it('loads the page successfully', async () => {
const w = new BrowserWindow({ show: false });
w.loadURL('chrome://webrtc-internals');
const pageExists = await w.webContents.executeJavaScript(
"window.hasOwnProperty('chrome') && window.chrome.hasOwnProperty('send')"
);
expect(pageExists).to.be.true();
});
});
}); });
describe('font fallback', () => { describe('font fallback', () => {