Merge branch 'master' into pr/18316

Conflicts:
	activerecord/CHANGELOG.md

1 files changed, 0 insertions, 22 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)