diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-05-01 16:24:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 16:24:20 -0700 |
| commit | 3fc489fff9f203e9937b06aec949042af0d45c29 (patch) | |
| tree | d49ca4aacba2f4cd50c76289bfabd783dbd4c36e /railties/test | |
| parent | 61de2e976405b3306ffa20f1b7e903ed21682483 (diff) | |
| parent | c0928831697306c0a92d5e71f35e8e060a59907b (diff) | |
| download | rails-3fc489fff9f203e9937b06aec949042af0d45c29.tar.gz rails-3fc489fff9f203e9937b06aec949042af0d45c29.tar.bz2 rails-3fc489fff9f203e9937b06aec949042af0d45c29.zip | |
Merge pull request #28943 from koshigoe/port-arg-has-precedence-over-env-var
CLI arg `--port` has precedence over env `PORT`
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/commands/server_test.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb index 2d1f071969..7731d10d9b 100644 --- a/railties/test/commands/server_test.rb +++ b/railties/test/commands/server_test.rb @@ -140,6 +140,18 @@ class Rails::ServerTest < ActiveSupport::TestCase end def test_argument_precedence_over_environment_variable + switch_env "PORT", "1234" do + args = ["-p", "5678"] + options = parse_arguments(args) + assert_equal 5678, options[:Port] + end + + switch_env "PORT", "1234" do + args = ["-p", "3000"] + options = parse_arguments(args) + assert_equal 3000, options[:Port] + end + switch_env "HOST", "1.2.3.4" do args = ["-b", "127.0.0.1"] options = parse_arguments(args) |