diff options
author | Richard Schneeman <richard.schneeman+no-recruiters@gmail.com> | 2017-02-24 19:29:34 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-24 19:29:34 -0600 |
commit | 0325758046ff51e1cbeae6ad7bd6d889b479cdad (patch) | |
tree | b085c7e7376680394263bd6a9b2a1841ec60c21e /railties/test | |
parent | 14ab460f8efa9d259cce0b9fa51ce87dc5687207 (diff) | |
parent | 6ac4dabbcfa092ddda24ae9ee4698a55eb495021 (diff) | |
download | rails-0325758046ff51e1cbeae6ad7bd6d889b479cdad.tar.gz rails-0325758046ff51e1cbeae6ad7bd6d889b479cdad.tar.bz2 rails-0325758046ff51e1cbeae6ad7bd6d889b479cdad.zip |
Merge pull request #28137 from schneems/schneems/fix-default-puma-port
[close #24435] Send user_supplied_options to server
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 e3dfc3e82b..0f236ff463 100644 --- a/railties/test/commands/server_test.rb +++ b/railties/test/commands/server_test.rb @@ -121,6 +121,14 @@ class Rails::ServerTest < ActiveSupport::TestCase end end + def test_records_user_supplied_options + server_options = parse_arguments(["-p", 3001]) + assert_equal [:Port], server_options[:user_supplied_options] + + server_options = parse_arguments(["--port", 3001]) + assert_equal [:Port], server_options[:user_supplied_options] + end + def test_default_options server = Rails::Server.new old_default_options = server.default_options |