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

1 files changed, 12 insertions, 14 deletions

diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 5e2fc20167..32ad87c12d 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -228,20 +228,18 @@ class AssetTagHelperTest < ActionView::TestCase
     ImageLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
-  uses_mocha 'test image tag with windows behaviour' do
-    def test_image_tag_windows_behaviour
-      old_asset_id, ENV["RAILS_ASSET_ID"] = ENV["RAILS_ASSET_ID"], "1"
-      # This simulates the behaviour of File#exist? on windows when testing a file ending in "."
-      # If the file "rails.png" exists, windows will return true when asked if "rails.png." exists (notice trailing ".")
-      # OS X, linux etc will return false in this case.
-      File.stubs(:exist?).with('template/../fixtures/public/images/rails.png.').returns(true)
-      assert_equal '<img alt="Rails" src="/images/rails.png?1" />', image_tag('rails.png')
-    ensure
-      if old_asset_id
-        ENV["RAILS_ASSET_ID"] = old_asset_id
-      else
-        ENV.delete("RAILS_ASSET_ID")
-      end
+  def test_image_tag_windows_behaviour
+    old_asset_id, ENV["RAILS_ASSET_ID"] = ENV["RAILS_ASSET_ID"], "1"
+    # This simulates the behaviour of File#exist? on windows when testing a file ending in "."
+    # If the file "rails.png" exists, windows will return true when asked if "rails.png." exists (notice trailing ".")
+    # OS X, linux etc will return false in this case.
+    File.stubs(:exist?).with('template/../fixtures/public/images/rails.png.').returns(true)
+    assert_equal '<img alt="Rails" src="/images/rails.png?1" />', image_tag('rails.png')
+  ensure
+    if old_asset_id
+      ENV["RAILS_ASSET_ID"] = old_asset_id
+    else
+      ENV.delete("RAILS_ASSET_ID")
     end
   end