mirror of
https://github.com/atom/atom.git
synced 2026-04-06 03:02:13 -04:00
Fix executeJavaScriptInDevTools
The joy of Atom and Electron having identically-named functions
This commit is contained in:
@@ -47,7 +47,7 @@ describe "AtomEnvironment", ->
|
||||
describe "window onerror handler", ->
|
||||
beforeEach ->
|
||||
spyOn atom, 'openDevTools'
|
||||
spyOn atom, 'webContents.executeJavaScriptInDevTools'
|
||||
spyOn atom, 'executeJavaScriptInDevTools'
|
||||
|
||||
it "will open the dev tools when an error is triggered", ->
|
||||
try
|
||||
@@ -56,7 +56,7 @@ describe "AtomEnvironment", ->
|
||||
window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
|
||||
|
||||
expect(atom.openDevTools).toHaveBeenCalled()
|
||||
expect(atom.webContents.executeJavaScriptInDevTools).toHaveBeenCalled()
|
||||
expect(atom.executeJavaScriptInDevTools).toHaveBeenCalled()
|
||||
|
||||
describe "::onWillThrowError", ->
|
||||
willThrowSpy = null
|
||||
@@ -91,7 +91,7 @@ describe "AtomEnvironment", ->
|
||||
|
||||
expect(willThrowSpy).toHaveBeenCalled()
|
||||
expect(atom.openDevTools).not.toHaveBeenCalled()
|
||||
expect(atom.webContents.executeJavaScriptInDevTools).not.toHaveBeenCalled()
|
||||
expect(atom.executeJavaScriptInDevTools).not.toHaveBeenCalled()
|
||||
|
||||
describe "::onDidThrowError", ->
|
||||
didThrowSpy = null
|
||||
|
||||
@@ -671,7 +671,7 @@ class AtomEnvironment extends Model
|
||||
|
||||
if openDevTools
|
||||
@openDevTools()
|
||||
@webContents.executeJavaScriptInDevTools('DevToolsAPI.showConsole()')
|
||||
@executeJavaScriptInDevTools('DevToolsAPI.showConsole()')
|
||||
|
||||
@emitter.emit 'did-throw-error', {message, url, line, column, originalError}
|
||||
|
||||
@@ -729,7 +729,7 @@ class AtomEnvironment extends Model
|
||||
@applicationDelegate.toggleWindowDevTools()
|
||||
|
||||
# Extended: Execute code in dev tools.
|
||||
webContents.executeJavaScriptInDevTools: (code) ->
|
||||
executeJavaScriptInDevTools: (code) ->
|
||||
@applicationDelegate.executeJavaScriptInWindowDevTools(code)
|
||||
|
||||
###
|
||||
|
||||
Reference in New Issue
Block a user