Merge commit 'mainstream/master'

Conflicts:
	railties/guides/files/javascripts/code_highlighter.js
	railties/guides/files/javascripts/guides.js
	railties/guides/files/javascripts/highlighters.js
	railties/guides/files/stylesheets/main.css
	railties/guides/files/stylesheets/print.css
	railties/guides/files/stylesheets/reset.css
	railties/guides/files/stylesheets/style.css
	railties/guides/files/stylesheets/syntax.css
	railties/guides/rails_guides/indexer.rb
	railties/guides/source/2_2_release_notes.textile
	railties/guides/source/2_3_release_notes.textile
	railties/guides/source/action_controller_overview.textile
	railties/guides/source/action_mailer_basics.textile
	railties/guides/source/active_record_basics.textile
	railties/guides/source/activerecord_validations_callbacks.textile
	railties/guides/source/association_basics.textile
	railties/guides/source/caching_with_rails.textile
	railties/guides/source/command_line.textile
	railties/guides/source/debugging_rails_applications.textile
	railties/guides/source/form_helpers.textile
	railties/guides/source/getting_started.textile
	railties/guides/source/i18n.textile
	railties/guides/source/layout.html.erb
	railties/guides/source/layouts_and_rendering.textile
	railties/guides/source/migrations.textile
	railties/guides/source/performance_testing.textile
	railties/guides/source/plugins.textile
	railties/guides/source/rails_on_rack.textile
	railties/guides/source/routing.textile
	railties/guides/source/security.textile
	railties/guides/source/testing.textile

2 files changed, 17 insertions, 23 deletions

diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb
index e612412033..83bf1ed510 100644
--- a/activeresource/test/abstract_unit.rb
+++ b/activeresource/test/abstract_unit.rb
@@ -1,5 +1,9 @@
+require 'rubygems'
 require 'test/unit'
 
+gem 'mocha', '>= 0.9.5'
+require 'mocha'
+
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'active_resource'
 require 'active_resource/http_mock'
@@ -10,17 +14,9 @@ require 'setter_trap'
 ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log")
 
 def uses_gem(gem_name, test_name, version = '> 0')
-  require 'rubygems'
   gem gem_name.to_s, version
   require gem_name.to_s
   yield
 rescue LoadError
   $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again."
 end
-
-# Wrap tests that use Mocha and skip if unavailable.
-unless defined? uses_mocha
-  def uses_mocha(test_name, &block)
-    uses_gem('mocha', test_name, '>= 0.5.5', &block)
-  end
-end
diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb
index 84bcf69219..831fbc4003 100644
--- a/activeresource/test/connection_test.rb
+++ b/activeresource/test/connection_test.rb
@@ -168,21 +168,19 @@ class ConnectionTest < Test::Unit::TestCase
     assert_equal 200, response.code
   end
 
-  uses_mocha('test_timeout, test_accept_http_header') do
-    def test_timeout
-      @http = mock('new Net::HTTP')
-      @conn.expects(:http).returns(@http)
-      @http.expects(:get).raises(Timeout::Error, 'execution expired')
-      assert_raise(ActiveResource::TimeoutError) { @conn.get('/people_timeout.xml') }
-    end
-
-    def test_accept_http_header
-      @http = mock('new Net::HTTP')
-      @conn.expects(:http).returns(@http)
-      path = '/people/1.xml'
-      @http.expects(:get).with(path,  {'Accept' => 'application/xhtml+xml'}).returns(ActiveResource::Response.new(@matz, 200, {'Content-Type' => 'text/xhtml'}))
-      assert_nothing_raised(Mocha::ExpectationError) { @conn.get(path, {'Accept' => 'application/xhtml+xml'}) }
-    end
+  def test_timeout
+    @http = mock('new Net::HTTP')
+    @conn.expects(:http).returns(@http)
+    @http.expects(:get).raises(Timeout::Error, 'execution expired')
+    assert_raise(ActiveResource::TimeoutError) { @conn.get('/people_timeout.xml') }
+  end
+
+  def test_accept_http_header
+    @http = mock('new Net::HTTP')
+    @conn.expects(:http).returns(@http)
+    path = '/people/1.xml'
+    @http.expects(:get).with(path,  {'Accept' => 'application/xhtml+xml'}).returns(ActiveResource::Response.new(@matz, 200, {'Content-Type' => 'text/xhtml'}))
+    assert_nothing_raised(Mocha::ExpectationError) { @conn.get(path, {'Accept' => 'application/xhtml+xml'}) }
   end
 
   protected