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, 66 insertions, 68 deletions

diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index caea1bd643..a7ed13cf57 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -1,87 +1,85 @@
 require 'abstract_unit'
 require 'controller/fake_models'
 
-uses_mocha 'TestTemplateRecompilation' do
-  class CompiledTemplatesTest < Test::Unit::TestCase
-    def setup
-      @compiled_templates = ActionView::Base::CompiledTemplates
-      @compiled_templates.instance_methods.each do |m|
-        @compiled_templates.send(:remove_method, m) if m =~ /^_run_/
-      end
+class CompiledTemplatesTest < Test::Unit::TestCase
+  def setup
+    @compiled_templates = ActionView::Base::CompiledTemplates
+    @compiled_templates.instance_methods.each do |m|
+      @compiled_templates.send(:remove_method, m) if m =~ /^_run_/
     end
+  end
 
-    def test_template_gets_compiled
-      assert_equal 0, @compiled_templates.instance_methods.size
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-      assert_equal 1, @compiled_templates.instance_methods.size
-    end
+  def test_template_gets_compiled
+    assert_equal 0, @compiled_templates.instance_methods.size
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    assert_equal 1, @compiled_templates.instance_methods.size
+  end
 
-    def test_template_gets_recompiled_when_using_different_keys_in_local_assigns
-      assert_equal 0, @compiled_templates.instance_methods.size
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb", :locals => {:foo => "bar"})
-      assert_equal 2, @compiled_templates.instance_methods.size
-    end
+  def test_template_gets_recompiled_when_using_different_keys_in_local_assigns
+    assert_equal 0, @compiled_templates.instance_methods.size
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb", :locals => {:foo => "bar"})
+    assert_equal 2, @compiled_templates.instance_methods.size
+  end
 
-    def test_compiled_template_will_not_be_recompiled_when_rendered_with_identical_local_assigns
-      assert_equal 0, @compiled_templates.instance_methods.size
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-      ActionView::Template.any_instance.expects(:compile!).never
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-    end
+  def test_compiled_template_will_not_be_recompiled_when_rendered_with_identical_local_assigns
+    assert_equal 0, @compiled_templates.instance_methods.size
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    ActionView::Template.any_instance.expects(:compile!).never
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+  end
 
-    def test_compiled_template_will_always_be_recompiled_when_template_is_not_cached
-      ActionView::Template.any_instance.expects(:recompile?).times(3).returns(true)
-      assert_equal 0, @compiled_templates.instance_methods.size
-      assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb")
-      ActionView::Template.any_instance.expects(:compile!).times(3)
-      3.times { assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb") }
-      assert_equal 1, @compiled_templates.instance_methods.size
-    end
+  def test_compiled_template_will_always_be_recompiled_when_template_is_not_cached
+    ActionView::Template.any_instance.expects(:recompile?).times(3).returns(true)
+    assert_equal 0, @compiled_templates.instance_methods.size
+    assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb")
+    ActionView::Template.any_instance.expects(:compile!).times(3)
+    3.times { assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb") }
+    assert_equal 1, @compiled_templates.instance_methods.size
+  end
 
-    def test_template_changes_are_not_reflected_with_cached_templates
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-      modify_template "test/hello_world.erb", "Goodbye world!" do
-        assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-      end
+  def test_template_changes_are_not_reflected_with_cached_templates
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    modify_template "test/hello_world.erb", "Goodbye world!" do
       assert_equal "Hello world!", render(:file => "test/hello_world.erb")
     end
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+  end
 
-    def test_template_changes_are_reflected_with_uncached_templates
-      assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
-      modify_template "test/hello_world.erb", "Goodbye world!" do
-        assert_equal "Goodbye world!", render_without_cache(:file => "test/hello_world.erb")
-      end
-      assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+  def test_template_changes_are_reflected_with_uncached_templates
+    assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+    modify_template "test/hello_world.erb", "Goodbye world!" do
+      assert_equal "Goodbye world!", render_without_cache(:file => "test/hello_world.erb")
     end
+    assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+  end
 
-    private
-      def render(*args)
-        render_with_cache(*args)
-      end
+  private
+    def render(*args)
+      render_with_cache(*args)
+    end
 
-      def render_with_cache(*args)
-        view_paths = ActionController::Base.view_paths
-        assert_equal ActionView::Template::EagerPath, view_paths.first.class
-        ActionView::Base.new(view_paths, {}).render(*args)
-      end
+    def render_with_cache(*args)
+      view_paths = ActionController::Base.view_paths
+      assert_equal ActionView::Template::EagerPath, view_paths.first.class
+      ActionView::Base.new(view_paths, {}).render(*args)
+    end
 
-      def render_without_cache(*args)
-        path = ActionView::Template::Path.new(FIXTURE_LOAD_PATH)
-        view_paths = ActionView::Base.process_view_paths(path)
-        assert_equal ActionView::Template::Path, view_paths.first.class
-        ActionView::Base.new(view_paths, {}).render(*args)
-      end
+    def render_without_cache(*args)
+      path = ActionView::Template::Path.new(FIXTURE_LOAD_PATH)
+      view_paths = ActionView::Base.process_view_paths(path)
+      assert_equal ActionView::Template::Path, view_paths.first.class
+      ActionView::Base.new(view_paths, {}).render(*args)
+    end
 
-      def modify_template(template, content)
-        filename = "#{FIXTURE_LOAD_PATH}/#{template}"
-        old_content = File.read(filename)
-        begin
-          File.open(filename, "wb+") { |f| f.write(content) }
-          yield
-        ensure
-          File.open(filename, "wb+") { |f| f.write(old_content) }
-        end
+    def modify_template(template, content)
+      filename = "#{FIXTURE_LOAD_PATH}/#{template}"
+      old_content = File.read(filename)
+      begin
+        File.open(filename, "wb+") { |f| f.write(content) }
+        yield
+      ensure
+        File.open(filename, "wb+") { |f| f.write(old_content) }
       end
-  end
+    end
 end