1 files changed, 40 insertions, 33 deletions
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index 2e8076ed2b..e3dfc3e82b 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -7,31 +7,35 @@ class Rails::ServerTest < ActiveSupport::TestCase
   include EnvHelpers
 
   def test_environment_with_server_option
-    args    = ["thin", "-e", "production"]
-    options = Rails::Server::Options.new.parse!(args)
+    args = ["thin", "-e", "production"]
+    options = parse_arguments(args)
     assert_equal "production", options[:environment]
     assert_equal "thin", options[:server]
   end
 
   def test_environment_without_server_option
-    args    = ["-e", "production"]
-    options = Rails::Server::Options.new.parse!(args)
+    args = ["-e", "production"]
+    options = parse_arguments(args)
     assert_equal "production", options[:environment]
     assert_nil options[:server]
   end
 
   def test_server_option_without_environment
-    args    = ["thin"]
-    options = Rails::Server::Options.new.parse!(args)
-    assert_nil options[:environment]
-    assert_equal "thin", options[:server]
+    args = ["thin"]
+    with_rack_env nil do
+      with_rails_env nil do
+        options = parse_arguments(args)
+        assert_equal "development",  options[:environment]
+        assert_equal "thin", options[:server]
+      end
+    end
   end
 
   def test_environment_with_rails_env
     with_rack_env nil do
       with_rails_env "production" do
-        server = Rails::Server.new
-        assert_equal "production", server.options[:environment]
+        options = parse_arguments
+        assert_equal "production", options[:environment]
       end
     end
   end
@@ -39,40 +43,39 @@ class Rails::ServerTest < ActiveSupport::TestCase
   def test_environment_with_rack_env
     with_rails_env nil do
       with_rack_env "production" do
-        server = Rails::Server.new
-        assert_equal "production", server.options[:environment]
+        options = parse_arguments
+        assert_equal "production", options[:environment]
       end
     end
   end
 
   def test_environment_with_port
     switch_env "PORT", "1234" do
-      server = Rails::Server.new
-      assert_equal 1234, server.options[:Port]
+      options = parse_arguments
+      assert_equal 1234, options[:Port]
     end
   end
 
   def test_environment_with_host
     switch_env "HOST", "1.2.3.4" do
-      server = Rails::Server.new
-      assert_equal "1.2.3.4", server.options[:Host]
+      options = parse_arguments
+      assert_equal "1.2.3.4", options[:Host]
     end
   end
 
   def test_caching_without_option
     args = []
-    options = Rails::Server::Options.new.parse!(args)
-    merged_options = Rails::Server.new.default_options.merge(options)
-    assert_nil merged_options[:caching]
+    options = parse_arguments(args)
+    assert_nil options[:caching]
   end
 
   def test_caching_with_option
     args = ["--dev-caching"]
-    options = Rails::Server::Options.new.parse!(args)
+    options = parse_arguments(args)
     assert_equal true, options[:caching]
 
     args = ["--no-dev-caching"]
-    options = Rails::Server::Options.new.parse!(args)
+    options = parse_arguments(args)
     assert_equal false, options[:caching]
   end
 
@@ -80,38 +83,38 @@ class Rails::ServerTest < ActiveSupport::TestCase
     with_rack_env nil do
       with_rails_env nil do
         args    = []
-        options = Rails::Server::Options.new.parse!(args)
+        options = parse_arguments(args)
         assert_equal true, options[:log_stdout]
 
         args    = ["-e", "development"]
-        options = Rails::Server::Options.new.parse!(args)
+        options = parse_arguments(args)
         assert_equal true, options[:log_stdout]
 
         args    = ["-e", "production"]
-        options = Rails::Server::Options.new.parse!(args)
+        options = parse_arguments(args)
         assert_equal false, options[:log_stdout]
 
         with_rack_env "development" do
           args    = []
-          options = Rails::Server::Options.new.parse!(args)
+          options = parse_arguments(args)
           assert_equal true, options[:log_stdout]
         end
 
         with_rack_env "production" do
           args    = []
-          options = Rails::Server::Options.new.parse!(args)
+          options = parse_arguments(args)
           assert_equal false, options[:log_stdout]
         end
 
         with_rails_env "development" do
           args    = []
-          options = Rails::Server::Options.new.parse!(args)
+          options = parse_arguments(args)
           assert_equal true, options[:log_stdout]
         end
 
         with_rails_env "production" do
           args    = []
-          options = Rails::Server::Options.new.parse!(args)
+          options = parse_arguments(args)
           assert_equal false, options[:log_stdout]
         end
       end
@@ -129,15 +132,19 @@ class Rails::ServerTest < ActiveSupport::TestCase
 
   def test_restart_command_contains_customized_options
     original_args = ARGV.dup
-    args = ["-p", "4567"]
+    args = %w(-p 4567 -b 127.0.0.1 -c dummy_config.ru -d -e test -P tmp/server.pid -C)
     ARGV.replace args
 
-    options = Rails::Server::Options.new.parse! args
-    server = Rails::Server.new options
-    expected = "bin/rails server -p 4567"
+    options = parse_arguments(args)
+    expected = "bin/rails server  -p 4567 -b 127.0.0.1 -c dummy_config.ru -d -e test -P tmp/server.pid -C"
 
-    assert_equal expected, server.default_options[:restart_cmd]
+    assert_equal expected, options[:restart_cmd]
   ensure
     ARGV.replace original_args
   end
+
+  private
+    def parse_arguments(args = [])
+      Rails::Command::ServerCommand.new([], args).server_options
+    end
 end