3 files changed, 33 insertions, 41 deletions

diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb
index 4aea3e980f..de0cf0ba9e 100644
--- a/railties/test/commands/console_test.rb
+++ b/railties/test/commands/console_test.rb
@@ -46,28 +46,6 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
     assert_match(/Loading \w+ environment in sandbox \(Rails/, output)
   end
 
-  if RUBY_VERSION < '2.0.0'
-    def test_debugger_option
-      console = Rails::Console.new(app, parse_arguments(["--debugger"]))
-      assert console.debugger?
-    end
-
-    def test_no_options_does_not_set_debugger_flag
-      console = Rails::Console.new(app, parse_arguments([]))
-      assert !console.debugger?
-    end
-
-    def test_start_with_debugger
-      stubbed_console = Class.new(Rails::Console) do
-        def require_debugger
-        end
-      end
-
-      rails_console = stubbed_console.new(app, parse_arguments(["--debugger"]))
-      silence_stream(STDOUT) { rails_console.start }
-    end
-  end
-
   def test_console_with_environment
     start ["-e production"]
     assert_match(/\sproduction\s/, output)
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index ede08e7b86..7950ed6aa7 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -28,7 +28,7 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
       }
     }
     app_db_config(config_sample) do
-      assert_equal Rails::DBConsole.new.config, config_sample["test"]
+      assert_equal config_sample["test"], Rails::DBConsole.new.config
     end
   end
 
@@ -79,38 +79,35 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
   end
 
   def test_env
-    assert_equal Rails::DBConsole.new.environment, "test"
+    assert_equal "test", Rails::DBConsole.new.environment
 
     ENV['RAILS_ENV'] = nil
     ENV['RACK_ENV'] = nil
 
     Rails.stub(:respond_to?, false) do
-      assert_equal Rails::DBConsole.new.environment, "development"
+      assert_equal "development", Rails::DBConsole.new.environment
 
       ENV['RACK_ENV'] = "rack_env"
-      assert_equal Rails::DBConsole.new.environment, "rack_env"
+      assert_equal "rack_env", Rails::DBConsole.new.environment
 
       ENV['RAILS_ENV'] = "rails_env"
-      assert_equal Rails::DBConsole.new.environment, "rails_env"
+      assert_equal "rails_env", Rails::DBConsole.new.environment
     end
   ensure
     ENV['RAILS_ENV'] = "test"
+    ENV['RACK_ENV'] = nil
   end
 
   def test_rails_env_is_development_when_argument_is_dev
-    dbconsole = Rails::DBConsole.new
-
-    dbconsole.stub(:available_environments, ['development', 'test']) do
-      options = dbconsole.send(:parse_arguments, ['dev'])
+    Rails::DBConsole.stub(:available_environments, ['development', 'test']) do
+      options = Rails::DBConsole.send(:parse_arguments, ['dev'])
       assert_match('development', options[:environment])
     end
   end
 
   def test_rails_env_is_dev_when_argument_is_dev_and_dev_env_is_present
-    dbconsole = Rails::DBConsole.new
-
-    dbconsole.stub(:available_environments, ['dev']) do
-      options = dbconsole.send(:parse_arguments, ['dev'])
+    Rails::DBConsole.stub(:available_environments, ['dev']) do
+      options = Rails::DBConsole.send(:parse_arguments, ['dev'])
       assert_match('dev', options[:environment])
     end
   end
@@ -157,12 +154,6 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
     assert_equal 'q1w2e3', ENV['PGPASSWORD']
   end
 
-  def test_sqlite
-    start(adapter: 'sqlite', database: 'db')
-    assert !aborted
-    assert_equal ['sqlite', 'db'], dbconsole.find_cmd_and_exec_args
-  end
-
   def test_sqlite3
     start(adapter: 'sqlite3', database: 'db.sqlite3')
     assert !aborted
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index ba688f1e9e..3be4a74f74 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -44,6 +44,29 @@ class Rails::ServerTest < ActiveSupport::TestCase
     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
+
+  def test_caching_with_option
+    args = ["--dev-caching"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal true, options[:caching]
+
+    args = ["--no-dev-caching"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal false, options[:caching]
+  end
+
   def test_log_stdout
     with_rack_env nil do
       with_rails_env nil do