diff --git a/spec/integration/helpers/start-atom.coffee b/spec/integration/helpers/start-atom.coffee index 2939dd6ab..7a9311896 100644 --- a/spec/integration/helpers/start-atom.coffee +++ b/spec/integration/helpers/start-atom.coffee @@ -1,6 +1,7 @@ path = require 'path' http = require 'http' temp = require('temp').track() +os = require('os') remote = require 'remote' async = require 'async' {map, extend, once, difference} = require 'underscore-plus' @@ -10,7 +11,7 @@ webdriverio = require '../../../build/node_modules/webdriverio' AtomPath = remote.process.argv[0] AtomLauncherPath = path.join(__dirname, "..", "helpers", "atom-launcher.sh") ChromedriverPath = path.resolve(__dirname, '..', '..', '..', 'electron', 'chromedriver', 'chromedriver') -SocketPath = path.join(temp.mkdirSync("socket-dir"), "atom-#{process.env.USER}.sock") +SocketPath = path.join(os.tmpdir(), "atom-integration-test-#{Date.now()}.sock") ChromedriverPort = 9515 ChromedriverURLBase = "/wd/hub" ChromedriverStatusURL = "http://localhost:#{ChromedriverPort}#{ChromedriverURLBase}/status" diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee index 1d60872df..1d1a7b2af 100644 --- a/src/atom-environment.coffee +++ b/src/atom-environment.coffee @@ -730,7 +730,7 @@ class AtomEnvironment extends Model @emitter.emit 'will-throw-error', eventObject if openDevTools - @openDevTools().then => @executeJavaScriptInDevTools('DevToolsAPI.showConsole()') + @openDevTools().then => @executeJavaScriptInDevTools('DevToolsAPI.showPanel("console")') @emitter.emit 'did-throw-error', {message, url, line, column, originalError} diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index d08990264..a9fa92c4b 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -325,9 +325,6 @@ class AtomApplication ipcMain.on 'get-auto-update-manager-error', (event) => event.returnValue = @autoUpdateManager.getErrorMessage() - ipcMain.on 'execute-javascript-in-dev-tools', (event, code) -> - event.sender.devToolsWebContents?.executeJavaScript(code) - setupDockMenu: -> if process.platform is 'darwin' dockMenu = Menu.buildFromTemplate [ diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee index 2f07dd443..c2909f8c9 100644 --- a/src/browser/atom-window.coffee +++ b/src/browser/atom-window.coffee @@ -24,7 +24,16 @@ class AtomWindow options = show: false title: 'Atom' + # Add an opaque backgroundColor (instead of keeping the default + # transparent one) to prevent subpixel anti-aliasing from being disabled. + # We believe this is a regression introduced with Electron 0.37.3, and + # thus we should remove this as soon as a fix gets released. + backgroundColor: "#fff" webPreferences: + # Prevent specs from throttling when the window is in the background: + # this should result in faster CI builds, and an improvement in the + # local development experience when running specs through the UI (which + # now won't pause when e.g. minimizing the window). backgroundThrottling: not @isSpec # Don't set icon on Windows so the exe's ico will be used as window and