2 files changed, 27 insertions, 14 deletions
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index a3cd1eb0ed..7950ed6aa7 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -99,19 +99,15 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
   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
@@ -158,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