github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: add missing shell_resources.pak to repack target (backport: 4-0-x) (#15852)

Browse Source 
* fix: add missing shell_resources.pak to repack target

Fixes #15815

* add a test

* kill socket before killing child process
This commit is contained in:
trop[bot]
2018-11-27 13:49:38 -08:00
committed by Shelley Vohr
parent 91a52f7268
commit 020457f09b
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electron_paks.gni
View File

@@ -56,6 +56,7 @@ template("electron_extra_paks") {
"$root_gen_dir/components/components_resources.pak",
"$root_gen_dir/content/browser/tracing/tracing_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/net/net_resources.pak",
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
@@ -65,6 +66,7 @@ template("electron_extra_paks") {
"//components/resources",
"//content:resources",
"//content/browser/tracing:resources",
"//content/shell:copy_shell_resources",
"//electron:resources",
"//mojo/public/js:resources",
"//net:net_resources",

23
spec/chromium-spec.js
View File

@@ -52,6 +52,29 @@ describe('chromium feature', () => {
it('should set the locale', (done) => testLocale('fr', 'fr', 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 }))