Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: devtools extensions not loading #20791

Merged
merged 1 commit into from Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/renderer/chrome-api.ts
Expand Up @@ -120,7 +120,11 @@ export function injectTo (extensionId: string, context: any) {
let targetExtensionId = extensionId
let connectInfo = { name: '' }
if (args.length === 1) {
targetExtensionId = args[0]
if (typeof args[0] === 'string') {
targetExtensionId = args[0]
} else {
connectInfo = args[0]
}
} else if (args.length === 2) {
[targetExtensionId, connectInfo] = args
}
Expand Down
14 changes: 14 additions & 0 deletions spec-main/extensions-spec.ts
Expand Up @@ -109,6 +109,20 @@ ifdescribe(!process.electronBinding('features').isExtensionsEnabled())('chrome e

afterEach(() => closeWindow(w).then(() => { w = null as unknown as BrowserWindow }))

it('chrome.runtime.connect parses arguments properly', async function () {
await w.loadURL('about:blank')

const promise = emittedOnce(w.webContents, 'console-message')

const message = { method: 'connect' }
w.webContents.executeJavaScript(`window.postMessage('${JSON.stringify(message)}', '*')`)

const [,, responseString] = await promise
const response = JSON.parse(responseString)

expect(response).to.be.true()
})

it('runtime.getManifest returns extension manifest', async () => {
const actualManifest = (() => {
const data = fs.readFileSync(path.join(fixtures, 'extensions/chrome-api/manifest.json'), 'utf-8')
Expand Down
11 changes: 11 additions & 0 deletions spec/fixtures/extensions/chrome-api/main.js
Expand Up @@ -5,6 +5,17 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
})

const testMap = {
connect () {
let success = false
try {
chrome.runtime.connect(chrome.runtime.id)
chrome.runtime.connect(chrome.runtime.id, { name: 'content-script' })
chrome.runtime.connect({ name: 'content-script' })
success = true
} finally {
console.log(JSON.stringify(success))
}
},
getManifest () {
const manifest = chrome.runtime.getManifest()
console.log(JSON.stringify(manifest))
Expand Down