Memoize the object returned by _view in ActionView::TestCase::Behavior

[#4799 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>

2 files changed, 12 insertions, 6 deletions

diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 4dbbd2eb6a..15d424be74 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -131,12 +131,14 @@ module ActionView
       end
 
       def _view
-        view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
-        view.singleton_class.send :include, _helpers
-        view.singleton_class.send :include, @controller._router.url_helpers
-        view.singleton_class.send :delegate, :alert, :notice, :to => "request.flash"
-        view.output_buffer = self.output_buffer
-        view
+        @_view ||= begin
+                     view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
+                     view.singleton_class.send :include, _helpers
+                     view.singleton_class.send :include, @controller._router.url_helpers
+                     view.singleton_class.send :delegate, :alert, :notice, :to => "request.flash"
+                     view.output_buffer = self.output_buffer
+                     view
+                   end
       end
 
       EXCLUDE_IVARS = %w{
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 16e5ee4f72..9b50ea8a42 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -37,6 +37,10 @@ module ActionView
     include SharedTests
     test_case = self
 
+    test "memoizes the _view" do
+      assert_same _view, _view
+    end
+
     test "works without testing a helper module" do
       assert_equal 'Eloy', render('developers/developer', :developer => stub(:name => 'Eloy'))
     end