From d763861747613086c98c0ab86f5867ed352d25ea Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Fri, 25 Oct 2019 21:00:51 +0200 Subject: [PATCH] And, reinstate code for test ENV var management --- test/test_pumactl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_pumactl.rb b/test/test_pumactl.rb index bb4c00b0a0..87aa4e029d 100644 --- a/test/test_pumactl.rb +++ b/test/test_pumactl.rb @@ -49,7 +49,7 @@ def test_rack_env_without_environment end def test_environment_without_rack_env - with_env("RACK_ENV" => nil) do + with_env("RACK_ENV" => nil, 'RAILS_ENV' => nil) do control_cli = Puma::ControlCLI.new ["halt"] assert_nil control_cli.instance_variable_get("@environment") @@ -91,7 +91,7 @@ def test_default_config_file_exist puma_config_file = "config/puma.rb" development_config_file = "config/puma/development.rb" - with_env("RACK_ENV" => nil) do + with_env("RACK_ENV" => nil, 'RAILS_ENV' => nil) do with_config_file(puma_config_file, port) do control_cli = Puma::ControlCLI.new ["halt"] assert_equal puma_config_file, control_cli.instance_variable_get("@config_file")