Merge branch 'master' into wl-electron-37

build/tasks/spec-task.coffee

@@ -17,20 +17,6 @@ module.exports = (grunt) ->
 
   packageSpecQueue = null
 
-  logDeprecations = (label, {stderr}={}) ->
-    return unless process.env.JANKY_SHA1 or process.env.CI
-    stderr ?= ''
-    deprecatedStart = stderr.indexOf('Calls to deprecated functions')
-    return if deprecatedStart is -1
-
-    grunt.log.error(label)
-    stderr = stderr.substring(deprecatedStart)
-    stderr = stderr.replace(/^\s*\[[^\]]+\]\s+/gm, '')
-    stderr = stderr.replace(/source: .*$/gm, '')
-    stderr = stderr.replace(/^"/gm, '')
-    stderr = stderr.replace(/",\s*$/gm, '')
-    grunt.log.error(stderr)
-
   getAppPath = ->
     contentsDir = grunt.config.get('atom.contentsDir')
     switch process.platform
@@ -57,14 +43,14 @@ module.exports = (grunt) ->
           args: ['--test', "--resource-path=#{resourcePath}", path.join(packagePath, 'spec')]
           opts:
             cwd: packagePath
-            env: _.extend({}, process.env, ATOM_PATH: rootDir)
+            env: _.extend({}, process.env, ELECTRON_ENABLE_LOGGING: true, ATOM_PATH: rootDir)
       else if process.platform is 'win32'
         options =
           cmd: process.env.comspec
           args: ['/c', appPath, '--test', "--resource-path=#{resourcePath}", "--log-file=ci.log", path.join(packagePath, 'spec')]
           opts:
             cwd: packagePath
-            env: _.extend({}, process.env, ATOM_PATH: rootDir)
+            env: _.extend({}, process.env, ELECTRON_ENABLE_LOGGING: true, ATOM_PATH: rootDir)
 
       grunt.log.ok "Launching #{path.basename(packagePath)} specs."
       spawn options, (error, results, code) ->
@@ -74,7 +60,6 @@ module.exports = (grunt) ->
           fs.unlinkSync(path.join(packagePath, 'ci.log'))
 
         failedPackages.push path.basename(packagePath) if error
-        logDeprecations("#{path.basename(packagePath)} Specs", results)
         callback()
 
     modulesDirectory = path.resolve('node_modules')
@@ -87,7 +72,7 @@ module.exports = (grunt) ->
     packageSpecQueue.concurrency = Math.max(1, concurrency - 1)
     packageSpecQueue.drain = -> callback(null, failedPackages)
 
-  runCoreSpecs = (callback, logOutput = false) ->
+  runCoreSpecs = (callback) ->
     appPath = getAppPath()
     resourcePath = process.cwd()
     coreSpecsPath = path.resolve('spec')
@@ -97,21 +82,16 @@ module.exports = (grunt) ->
         cmd: appPath
         args: ['--test', "--resource-path=#{resourcePath}", coreSpecsPath, "--user-data-dir=#{temp.mkdirSync('atom-user-data-dir')}"]
         opts:
-          env: _.extend({}, process.env,
-            ATOM_INTEGRATION_TESTS_ENABLED: true
-          )
+          env: _.extend({}, process.env, {ELECTRON_ENABLE_LOGGING: true, ATOM_INTEGRATION_TESTS_ENABLED: true})
+          stdio: 'inherit'
 
     else if process.platform is 'win32'
       options =
         cmd: process.env.comspec
         args: ['/c', appPath, '--test', "--resource-path=#{resourcePath}", '--log-file=ci.log', coreSpecsPath]
         opts:
-          env: _.extend({}, process.env,
-            ATOM_INTEGRATION_TESTS_ENABLED: true
-          )
-
-    if logOutput
-      options.opts.stdio = 'inherit'
+          env: _.extend({}, process.env, {ELECTRON_ENABLE_LOGGING: true, ATOM_INTEGRATION_TESTS_ENABLED: true})
+          stdio: 'inherit'
 
     grunt.log.ok "Launching core specs."
     spawn options, (error, results, code) ->
@@ -121,7 +101,6 @@ module.exports = (grunt) ->
       else
         # TODO: Restore concurrency on Windows
         packageSpecQueue?.concurrency = concurrency
-        logDeprecations('Core Specs', results)
 
       callback(null, error)
 
@@ -134,17 +113,11 @@ module.exports = (grunt) ->
       else
         async.parallel
 
-    # If we're just running the core specs then we won't have any output to
-    # indicate the tests actually *are* running. This upsets Travis:
-    # https://github.com/atom/atom/issues/10837. So pass the test output
-    # through.
-    runCoreSpecsWithLogging = (callback) -> runCoreSpecs(callback, true)
-
     specs =
       if process.env.ATOM_SPECS_TASK is 'packages'
         [runPackageSpecs]
       else if process.env.ATOM_SPECS_TASK is 'core'
-        [runCoreSpecsWithLogging]
+        [runCoreSpecs]
       else
         [runCoreSpecs, runPackageSpecs]
 

package.json

@@ -88,7 +88,7 @@
     "deprecation-cop": "0.54.1",
     "dev-live-reload": "0.47.0",
     "encoding-selector": "0.21.0",
-    "exception-reporting": "0.38.0",
+    "exception-reporting": "0.38.1",
     "fuzzy-finder": "1.0.4",
     "git-diff": "1.0.1",
     "find-and-replace": "0.198.0",

spec/jasmine-test-runner.coffee

@@ -1,3 +1,4 @@
+Grim = require 'grim'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
 path = require 'path'
@@ -96,13 +97,10 @@ buildTerminalReporter = (logFile, resolveWithExitCode) ->
       log(str)
     onComplete: (runner) ->
       fs.closeSync(logStream) if logStream?
-      if process.env.JANKY_SHA1 or process.env.CI
-        grim = require 'grim'
-
-        if grim.getDeprecationsLength() > 0
-          grim.logDeprecations()
-          resolveWithExitCode(1)
-          return
+      if Grim.getDeprecationsLength() > 0
+        Grim.logDeprecations()
+        resolveWithExitCode(1)
+        return
 
       if runner.results().failedCount > 0
         resolveWithExitCode(1)

src/buffered-node-process.coffee

@@ -47,6 +47,7 @@ class BufferedNodeProcess extends BufferedProcess
     options ?= {}
     options.env ?= Object.create(process.env)
     options.env['ELECTRON_RUN_AS_NODE'] = 1
+    options.env['ELECTRON_NO_ATTACH_CONSOLE'] = 1
 
     args = args?.slice() ? []
     args.unshift(command)