1 files changed, 65 insertions, 17 deletions
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index 8427ac1bc2..3be4a74f74 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -27,36 +27,84 @@ class Rails::ServerTest < ActiveSupport::TestCase
   end
 
   def test_environment_with_rails_env
-    with_rails_env 'production' do
-      server = Rails::Server.new
-      assert_equal 'production', server.options[:environment]
+    with_rack_env nil do
+      with_rails_env 'production' do
+        server = Rails::Server.new
+        assert_equal 'production', server.options[:environment]
+      end
     end
   end
 
-  def test_log_stdout
+  def test_environment_with_rack_env
     with_rails_env nil do
-      args    = []
-      options = Rails::Server::Options.new.parse!(args)
-      assert_equal true, options[:log_stdout]
+      with_rack_env 'production' do
+        server = Rails::Server.new
+        assert_equal 'production', server.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]
+    end
+  end
+
+  def test_caching_without_option
+    args = []
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal nil, options[:caching]
+  end
 
-      args    = ["-e", "development"]
-      options = Rails::Server::Options.new.parse!(args)
-      assert_equal true, options[:log_stdout]
+  def test_caching_with_option
+    args = ["--dev-caching"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal true, options[:caching]
 
-      args    = ["-e", "production"]
-      options = Rails::Server::Options.new.parse!(args)
-      assert_equal false, options[:log_stdout]
+    args = ["--no-dev-caching"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal false, options[:caching]
+  end
 
-      with_rails_env 'development' do
+  def test_log_stdout
+    with_rack_env nil do
+      with_rails_env nil do
         args    = []
         options = Rails::Server::Options.new.parse!(args)
         assert_equal true, options[:log_stdout]
-      end
 
-      with_rails_env 'production' do
-        args    = []
+        args    = ["-e", "development"]
+        options = Rails::Server::Options.new.parse!(args)
+        assert_equal true, options[:log_stdout]
+
+        args    = ["-e", "production"]
         options = Rails::Server::Options.new.parse!(args)
         assert_equal false, options[:log_stdout]
+
+        with_rack_env 'development' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal true, options[:log_stdout]
+        end
+
+        with_rack_env 'production' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal false, options[:log_stdout]
+        end
+
+        with_rails_env 'development' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal true, options[:log_stdout]
+        end
+
+        with_rails_env 'production' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal false, options[:log_stdout]
+        end
       end
     end
   end