Merge branch 'master' into active_model

Conflicts:
	activeresource/lib/active_resource/validations.rb

1 files changed, 43 insertions, 0 deletions

diff --git a/actionpack/test/abstract_controller/helper_test.rb b/actionpack/test/abstract_controller/helper_test.rb
new file mode 100644
index 0000000000..6284fa4f70
--- /dev/null
+++ b/actionpack/test/abstract_controller/helper_test.rb
@@ -0,0 +1,43 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+
+module AbstractController
+  module Testing
+  
+    class ControllerWithHelpers < AbstractController::Base
+      use Renderer
+      use Helpers
+      
+      def render(string)
+        super(:_template_name => string)
+      end
+      
+      append_view_path File.expand_path(File.join(File.dirname(__FILE__), "views"))
+    end
+   
+    module HelperyTest
+      def included_method
+        "Included"
+      end
+    end
+   
+    class MyHelpers1 < ControllerWithHelpers
+      helper(HelperyTest) do
+        def helpery_test
+          "World"
+        end
+      end
+      
+      def index
+        render "helper_test.erb"
+      end
+    end
+    
+    class TestHelpers < ActiveSupport::TestCase
+      def test_helpers
+        result = MyHelpers1.process(:index)
+        assert_equal "Hello World : Included", result.response_obj[:body]
+      end
+    end
+    
+  end
+end
\ No newline at end of file