aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-12-25 06:25:10 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-12-25 06:25:10 +0900
commit91a4a820feeb878dd1b388befa56dd469933d17c (patch)
treedc4b9a40ecc5b2249791b15e63ca2b89b1048018 /railties
parent0eefc8fdacad17eeec7840f94848e6f7a46e1a2e (diff)
downloadrails-91a4a820feeb878dd1b388befa56dd469933d17c.tar.gz
rails-91a4a820feeb878dd1b388befa56dd469933d17c.tar.bz2
rails-91a4a820feeb878dd1b388befa56dd469933d17c.zip
Ensure to use repo's Gemfile in application
Puma gets bundler's info from `Bundler::ORIGINAL_ENV` for restart. https://github.com/puma/puma/blob/f6f3892f4d82638fb7a2a57d993641b1486ee88a/lib/puma/launcher.rb#L168 So, specified `BUNDLE_GEMFILE` env for use same Gemfile in the restart. Fixes #31351
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/server_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/test/application/server_test.rb b/railties/test/application/server_test.rb
index 2238f4f63a..a6093b5733 100644
--- a/railties/test/application/server_test.rb
+++ b/railties/test/application/server_test.rb
@@ -35,6 +35,11 @@ module ApplicationTests
test "restart rails server with custom pid file path" do
skip "PTY unavailable" unless available_pty?
+ File.open("#{app_path}/config/boot.rb", "w") do |f|
+ f.puts "ENV['BUNDLE_GEMFILE'] = '#{Bundler.default_gemfile.to_s}'"
+ f.puts "require 'bundler/setup'"
+ end
+
master, slave = PTY.open
pid = nil