fix: add missing shell_resources.pak to repack target (#15844)
This commit is contained in:
parent
5bb35bbdaf
commit
455f0669e7
2 changed files with 25 additions and 0 deletions
|
@ -56,6 +56,7 @@ template("electron_extra_paks") {
|
||||||
"$root_gen_dir/components/components_resources.pak",
|
"$root_gen_dir/components/components_resources.pak",
|
||||||
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
|
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
|
||||||
"$root_gen_dir/content/content_resources.pak",
|
"$root_gen_dir/content/content_resources.pak",
|
||||||
|
"$root_gen_dir/content/shell/shell_resources.pak",
|
||||||
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
|
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
|
||||||
"$root_gen_dir/net/net_resources.pak",
|
"$root_gen_dir/net/net_resources.pak",
|
||||||
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
|
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
|
||||||
|
@ -65,6 +66,7 @@ template("electron_extra_paks") {
|
||||||
"//components/resources",
|
"//components/resources",
|
||||||
"//content:resources",
|
"//content:resources",
|
||||||
"//content/browser/tracing:resources",
|
"//content/browser/tracing:resources",
|
||||||
|
"//content/shell:copy_shell_resources",
|
||||||
"//electron:resources",
|
"//electron:resources",
|
||||||
"//mojo/public/js:resources",
|
"//mojo/public/js:resources",
|
||||||
"//net:net_resources",
|
"//net:net_resources",
|
||||||
|
|
|
@ -53,6 +53,29 @@ describe('chromium feature', () => {
|
||||||
it('should set the locale', (done) => testLocale('fr', 'fr', done))
|
it('should set the locale', (done) => testLocale('fr', 'fr', done))
|
||||||
it('should not set an invalid locale', (done) => testLocale('asdfkl', currentLocale, done))
|
it('should not set an invalid locale', (done) => testLocale('asdfkl', currentLocale, done))
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe('--remote-debugging-port switch', () => {
|
||||||
|
it('should display the discovery page', (done) => {
|
||||||
|
const electronPath = remote.getGlobal('process').execPath
|
||||||
|
let output = ''
|
||||||
|
const appProcess = ChildProcess.spawn(electronPath, [`--remote-debugging-port=`])
|
||||||
|
|
||||||
|
appProcess.stderr.on('data', (data) => {
|
||||||
|
output += data
|
||||||
|
const m = /DevTools listening on ws:\/\/127.0.0.1:(\d+)\//.exec(output)
|
||||||
|
if (m) {
|
||||||
|
const port = m[1]
|
||||||
|
http.get(`http://127.0.0.1:${port}`, (res) => {
|
||||||
|
res.destroy()
|
||||||
|
appProcess.kill()
|
||||||
|
expect(res.statusCode).to.eql(200)
|
||||||
|
expect(parseInt(res.headers['content-length'])).to.be.greaterThan(0)
|
||||||
|
done()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
afterEach(() => closeWindow(w).then(() => { w = null }))
|
afterEach(() => closeWindow(w).then(() => { w = null }))
|
||||||
|
|
Loading…
Reference in a new issue