Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Add --main-process flag to run specs in the main process #11826

Merged
merged 9 commits into from
May 25, 2016
Merged

Add --main-process flag to run specs in the main process #11826

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
62d48c6
Add --main-process flag to run specs in the main process
May 24, 2016
48c5db5
Use args.resourcePath instead of args.devResourcePath
May 24, 2016
75d4919
Restore concurrency on renderer specs
May 24, 2016
01e8601
:art: runCoreSpecs -> runRendererProcessSpecs
May 24, 2016
a1a609a
Output renderer/main processes failure message
May 24, 2016
1817c79
Run tests after the application is ready
May 25, 2016
33d58bf
Move devDependencies under dependencies
May 25, 2016
df0b3de
browser -> main-process
May 25, 2016
5e3f343
Merge branch 'master' into as-main-process-test-runner
May 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore concurrency on renderer specs
  • Loading branch information
Antonio Scandurra committed May 24, 2016
commit 75d491948934b329832826353b454a5b4f275bc4
6 changes: 3 additions & 3 deletions build/tasks/spec-task.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ module.exports = (grunt) ->
if process.platform is 'win32'
process.stderr.write(fs.readFileSync('ci.log')) if error
fs.unlinkSync('ci.log')
else
# TODO: Restore concurrency on Windows
packageSpecQueue?.concurrency = concurrency

callback(null, error)

Expand All @@ -123,9 +126,6 @@ module.exports = (grunt) ->

grunt.log.ok "Launching core specs (main process)."
spawn options, (error, results, code) ->
if process.platform isnt 'windows'
packageSpecQueue?.concurrency = concurrency

callback(null, error)

grunt.registerTask 'run-specs', 'Run the specs', ->
Expand Down
1 change: 0 additions & 1 deletion spec/browser/mocha-test-runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import Mocha from 'mocha'
import fs from 'fs-plus'
import {assert} from 'chai'
import util from 'util'

export default function (testPaths) {
global.assert = assert
Expand Down