diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-03-22 19:17:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-22 19:17:23 -0400 |
commit | 5e3ddf628397b8f3e88d7c3114d060e06289ac4c (patch) | |
tree | 16cccfe095433b37e12c26094b130f0355fd9f42 /railties/test | |
parent | 0709b60fbe2e9eff8b9d07b5c0d4b60f4660f968 (diff) | |
parent | d0accc23b3d01a7d35e73c5dc901014d883ef5f7 (diff) | |
download | rails-5e3ddf628397b8f3e88d7c3114d060e06289ac4c.tar.gz rails-5e3ddf628397b8f3e88d7c3114d060e06289ac4c.tar.bz2 rails-5e3ddf628397b8f3e88d7c3114d060e06289ac4c.zip |
Merge pull request #28513 from maclover7/jm-fix-28500
CLI arg "host" has precedence over ENV var "host"
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/commands/server_test.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb index d21a80982b..2d1f071969 100644 --- a/railties/test/commands/server_test.rb +++ b/railties/test/commands/server_test.rb @@ -139,6 +139,14 @@ class Rails::ServerTest < ActiveSupport::TestCase end end + def test_argument_precedence_over_environment_variable + switch_env "HOST", "1.2.3.4" do + args = ["-b", "127.0.0.1"] + options = parse_arguments(args) + assert_equal "127.0.0.1", options[:Host] + end + end + def test_records_user_supplied_options server_options = parse_arguments(["-p", 3001]) assert_equal [:Port], server_options[:user_supplied_options] |