Rails 3.0.1 and up uses view_assigns instead of _assigns. This commit

supports both.
rspec · Oct 2, 2010 · 7de6d05 · 7de6d05 · solnic · Oct 2, 2010
1 parent f5ba00e
commit 7de6d05
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/rspec/rails/example/helper_example_group.rb b/lib/rspec/rails/example/helper_example_group.rb
@@ -49,7 +49,7 @@ module InstanceMethods
       # Returns an instance of ActionView::Base with the helper being specified
       # mixed in, along with any of the built-in rails helpers.
       def helper
-        _view.tap {|v| v.assign(_assigns)}
+        _view.tap {|v| v.assign(view_assigns)}
       end
 
     private

diff --git a/lib/rspec/rails/view_assigns.rb b/lib/rspec/rails/view_assigns.rb
@@ -15,13 +15,19 @@ def assign(key, value)
 
       private
 
-        def _encapsulated_assigns
-          @_encapsulated_assigns ||= {}
+        # === Rails-3.0.1 and up calls down to this
+        def view_assigns
+          super.merge(_encapsulated_assigns)
         end
 
+        # === Rails-3.0.0 calls down to this
         def _assigns
           super.merge(_encapsulated_assigns)
         end
+
+        def _encapsulated_assigns
+          @_encapsulated_assigns ||= {}
+        end
       end
     end
   end