1 files changed, 40 insertions, 28 deletions

diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb
index a34beaedb3..de0cf0ba9e 100644
--- a/railties/test/commands/console_test.rb
+++ b/railties/test/commands/console_test.rb
@@ -6,7 +6,13 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
   include EnvHelpers
 
   class FakeConsole
-    def self.start; end
+    def self.started?
+      @started
+    end
+
+    def self.start
+      @started = true
+    end
   end
 
   def test_sandbox_option
@@ -19,36 +25,24 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
     assert console.sandbox?
   end
 
-  def test_debugger_option
-    console = Rails::Console.new(app, parse_arguments(["--debugger"]))
-    assert console.debugger?
-  end
-
   def test_no_options
     console = Rails::Console.new(app, parse_arguments([]))
-    assert !console.debugger?
     assert !console.sandbox?
   end
 
   def test_start
-    FakeConsole.expects(:start)
     start
-    assert_match(/Loading \w+ environment \(Rails/, output)
-  end
 
-  def test_start_with_debugger
-    rails_console = Rails::Console.new(app, parse_arguments(["--debugger"]))
-    rails_console.expects(:require_debugger).returns(nil)
-
-    silence_stream(STDOUT) { rails_console.start }
+    assert app.console.started?
+    assert_match(/Loading \w+ environment \(Rails/, output)
   end
 
   def test_start_with_sandbox
-    app.expects(:sandbox=).with(true)
-    FakeConsole.expects(:start)
-
     start ["--sandbox"]
 
+
+    assert app.console.started?
+    assert app.sandbox
     assert_match(/Loading \w+ environment in sandbox \(Rails/, output)
   end
 
@@ -58,7 +52,7 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
   end
 
   def test_console_defaults_to_IRB
-    app = build_app(console: nil)
+    app = build_app(nil)
     assert_equal IRB, Rails::Console.new(app).console
   end
 
@@ -109,8 +103,12 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
   end
 
   def test_rails_env_is_dev_when_argument_is_dev_and_dev_env_is_present
-    Rails::Console.stubs(:available_environments).returns(['dev'])
-    options = Rails::Console.parse_arguments(['dev'])
+    stubbed_console = Class.new(Rails::Console) do
+      def available_environments
+        ['dev']
+      end
+    end
+    options = stubbed_console.parse_arguments(['dev'])
     assert_match('dev', options[:environment])
   end
 
@@ -125,15 +123,29 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
   end
 
   def app
-    @app ||= build_app(console: FakeConsole)
+    @app ||= build_app(FakeConsole)
   end
 
-  def build_app(config)
-    config = mock("config", config)
-    app = mock("app", config: config)
-    app.stubs(:sandbox=).returns(nil)
-    app.expects(:load_console)
-    app
+  def build_app(console)
+    mocked_console = Class.new do
+      attr_reader :sandbox, :console
+
+      def initialize(console)
+        @console = console
+      end
+
+      def config
+        self
+      end
+
+      def sandbox=(arg)
+        @sandbox = arg
+      end
+
+      def load_console
+      end
+    end
+    mocked_console.new(console)
   end
 
   def parse_arguments(args)