Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

2 files changed, 13 insertions, 9 deletions

diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb
index 1af535e811..fcb770d612 100644
--- a/activeresource/test/abstract_unit.rb
+++ b/activeresource/test/abstract_unit.rb
@@ -1,12 +1,14 @@
 require File.expand_path('../../../load_paths', __FILE__)
 
+lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+
 require 'rubygems'
 require 'test/unit'
 require 'active_resource'
 require 'active_support'
 require 'active_support/test_case'
 
-$:.unshift "#{File.dirname(__FILE__)}/../test"
 require 'setter_trap'
 
 require 'logger'
diff --git a/activeresource/test/cases/subscriber_test.rb b/activeresource/test/cases/log_subscriber_test.rb
index fb890e86cb..f0330e8f51 100644
--- a/activeresource/test/cases/subscriber_test.rb
+++ b/activeresource/test/cases/log_subscriber_test.rb
@@ -1,20 +1,22 @@
 require "abstract_unit"
 require "fixtures/person"
-require "rails/subscriber/test_helper"
-require "active_resource/railties/subscriber"
+require "rails/log_subscriber/test_helper"
+require "active_resource/railties/log_subscriber"
 require "active_support/core_ext/hash/conversions"
 
-class SubscriberTest < ActiveSupport::TestCase
-  include Rails::Subscriber::TestHelper
-  Rails::Subscriber.add(:active_resource, ActiveResource::Railties::Subscriber.new)
+# TODO: This test should be part of Railties
+class LogSubscriberTest < ActiveSupport::TestCase
+  include Rails::LogSubscriber::TestHelper
 
   def setup
+    super
+
     @matz = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person')
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get "/people/1.xml", {}, @matz
     end
 
-    super
+    Rails::LogSubscriber.add(:active_resource, ActiveResource::Railties::LogSubscriber.new)
   end
 
   def set_logger(logger)
@@ -26,6 +28,6 @@ class SubscriberTest < ActiveSupport::TestCase
     wait
     assert_equal 2, @logger.logged(:info).size
     assert_equal "GET http://37s.sunrise.i:3000/people/1.xml", @logger.logged(:info)[0]
-    assert_match /\-\-\> 200 200 106/, @logger.logged(:info)[1]
+    assert_match(/\-\-\> 200 200 106/, @logger.logged(:info)[1])
   end
-end
\ No newline at end of file
+end