diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-30 14:49:59 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-30 14:49:59 -0700 |
commit | 4056915cf5dd885186465f63dce0ad9caf6e60f8 (patch) | |
tree | 98ff0f6fcd02335d8a8d82777c16f444ebfdfcf8 /railties/test/commands/server_test.rb | |
parent | c56ef677058de800fbdd16affaf00af10832d69c (diff) | |
parent | dce0afd47f334f61a4ab22acccef7c5e9d6e8b0a (diff) | |
download | rails-4056915cf5dd885186465f63dce0ad9caf6e60f8.tar.gz rails-4056915cf5dd885186465f63dce0ad9caf6e60f8.tar.bz2 rails-4056915cf5dd885186465f63dce0ad9caf6e60f8.zip |
Merge pull request #6276 from samoli/fix_console_arguments
Fix various bugs with console arguments and improve test coverage
Diffstat (limited to 'railties/test/commands/server_test.rb')
-rw-r--r-- | railties/test/commands/server_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb index 8039aec873..4a3ea82e3d 100644 --- a/railties/test/commands/server_test.rb +++ b/railties/test/commands/server_test.rb @@ -4,14 +4,14 @@ require 'rails/commands/server' class Rails::ServerTest < ActiveSupport::TestCase def test_environment_with_server_option - args = ["thin", "RAILS_ENV=production"] + args = ["thin", "-e", "production"] options = Rails::Server::Options.new.parse!(args) assert_equal 'production', options[:environment] assert_equal 'thin', options[:server] end def test_environment_without_server_option - args = ["RAILS_ENV=production"] + args = ["-e", "production"] options = Rails::Server::Options.new.parse!(args) assert_equal 'production', options[:environment] assert_nil options[:server] |