diff options
Diffstat (limited to 'railties/test/application/server_test.rb')
-rw-r--r-- | railties/test/application/server_test.rb | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/railties/test/application/server_test.rb b/railties/test/application/server_test.rb index f4bd09903a..5b8aab08d5 100644 --- a/railties/test/application/server_test.rb +++ b/railties/test/application/server_test.rb @@ -29,16 +29,18 @@ module ApplicationTests primary, replica = PTY.open pid = nil - begin - pid = Process.spawn("#{app_path}/bin/rails server -P tmp/dummy.pid", in: replica, out: replica, err: replica) - assert_output("Listening", primary) - - rails("restart") - - assert_output("Restarting", primary) - assert_output("Inherited", primary) - ensure - kill(pid) if pid + Bundler.with_original_env do + begin + pid = Process.spawn("bin/rails server -P tmp/dummy.pid", chdir: app_path, in: replica, out: replica, err: replica) + assert_output("Listening", primary) + + rails("restart") + + assert_output("Restarting", primary) + assert_output("Inherited", primary) + ensure + kill(pid) if pid + end end end |