Merge branch 'rm-remove-mocha'

Conflicts:
	actionpack/test/abstract_unit.rb

2 files changed, 28 insertions, 10 deletions

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index e6e2c67826..21244188dd 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -66,13 +66,25 @@ module ApplicationTests
         config.action_dispatch.show_exceptions  = true
       RUBY
 
+      app_file 'db/migrate/20140708012246_create_user.rb', <<-RUBY
+        class CreateUser < ActiveRecord::Migration
+          def change
+            create_table :users
+          end
+        end
+      RUBY
+
       require "#{app_path}/config/environment"
-      ActiveRecord::Migrator.stubs(:needs_migration?).returns(true)
-      ActiveRecord::NullMigration.any_instance.stubs(:mtime).returns(1)
 
-      get "/foo"
-      assert_equal 500, last_response.status
-      assert_match "ActiveRecord::PendingMigrationError", last_response.body
+      ActiveRecord::Migrator.migrations_paths = ["#{app_path}/db/migrate"]
+
+      begin
+        get "/foo"
+        assert_equal 500, last_response.status
+        assert_match "ActiveRecord::PendingMigrationError", last_response.body
+      ensure
+        ActiveRecord::Migrator.migrations_paths = nil
+      end
     end
 
     test "Rails.groups returns available groups" do
@@ -372,6 +384,8 @@ module ApplicationTests
       end
       RUBY
 
+      token = "cf50faa3fe97702ca1ae"
+
       app_file 'app/controllers/posts_controller.rb', <<-RUBY
       class PostsController < ApplicationController
         def show
@@ -381,6 +395,10 @@ module ApplicationTests
         def update
           render text: "update"
         end
+
+        private
+
+        def form_authenticity_token; token; end # stub the authenticy token
       end
       RUBY
 
@@ -392,8 +410,6 @@ module ApplicationTests
 
       require "#{app_path}/config/environment"
 
-      token = "cf50faa3fe97702ca1ae"
-      PostsController.any_instance.stubs(:form_authenticity_token).returns(token)
       params = {authenticity_token: token}
 
       get "/posts/1"
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
index 701843a6fd..0082ec9cd2 100644
--- a/railties/test/application/rack/logger_test.rb
+++ b/railties/test/application/rack/logger_test.rb
@@ -11,10 +11,12 @@ module ApplicationTests
 
       def setup
         build_app
+        add_to_config <<-RUBY
+          config.logger = ActiveSupport::LogSubscriber::TestHelper::MockLogger.new
+        RUBY
+
         require "#{app_path}/config/environment"
         super
-        @logger = MockLogger.new
-        Rails.stubs(:logger).returns(@logger)
       end
 
       def teardown
@@ -23,7 +25,7 @@ module ApplicationTests
       end
 
       def logs
-        @logs ||= @logger.logged(:info).join("\n")
+        @logs ||= Rails.logger.logged(:info).join("\n")
       end
 
       test "logger logs proper HTTP GET verb and path" do