diff options
| author | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-11-09 09:31:16 -0800 |
|---|---|---|
| committer | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-11-09 09:31:16 -0800 |
| commit | d0550ff6717f18961493ab065ff2eebed6199525 (patch) | |
| tree | f5ff24082dd79e429b7a33e8fe217ffa3bc0b02b /actionview/Rakefile | |
| parent | d58078d8d65de38d9dca9c629c91e13df291dbb3 (diff) | |
| parent | 5961d6882bc3a6aaa2b3735e7a8cbe3f2fb901af (diff) | |
| download | rails-d0550ff6717f18961493ab065ff2eebed6199525.tar.gz rails-d0550ff6717f18961493ab065ff2eebed6199525.tar.bz2 rails-d0550ff6717f18961493ab065ff2eebed6199525.zip | |
Merge branch 'master' into activestorage-guide
Diffstat (limited to 'actionview/Rakefile')
| -rw-r--r-- | actionview/Rakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/Rakefile b/actionview/Rakefile index 9e5ef35334..8650f541b0 100644 --- a/actionview/Rakefile +++ b/actionview/Rakefile @@ -32,7 +32,7 @@ namespace :test do task :ujs do begin Dir.mkdir("log") - pid = spawn("bundle exec rackup test/ujs/config.ru -p 4567 -s puma > log/test.log 2>&1") + pid = spawn("bundle exec rackup test/ujs/config.ru -p 4567 -s puma > log/test.log 2>&1", pgroup: true) start_time = Time.now @@ -48,7 +48,7 @@ namespace :test do system("npm run lint && bundle exec ruby ../ci/qunit-selenium-runner.rb http://localhost:4567/") status = $?.exitstatus ensure - Process.kill("KILL", pid) if pid + Process.kill("KILL", -pid) if pid FileUtils.rm_rf("log") end |