Patch ActionController::TestCase#assigns for Rails5

rails-api · Nov 24, 2015 · e568c8f · e568c8f
1 parent fed4621
commit e568c8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -21,8 +21,6 @@ if version == 'master'
     # Rails 5
     gem 'actionview'
   end
-  # Rails 5
-  gem 'rails-controller-testing', github: 'rails/rails-controller-testing'
 else
   gem_version = "~> #{version}.0"
   gem 'railties', gem_version

diff --git a/test/support/test_case.rb b/test/support/test_case.rb
@@ -2,4 +2,12 @@
   def setup
     @routes = TestHelper::Routes
   end
+
+  # For Rails5
+  # https://github.com/rails/rails/commit/ca83436d1b3b6cedd1eca2259f65661e69b01909#diff-b9bbf56e85d3fe1999f16317f2751e76L17
+  def assigns(key = nil)
+    assigns = {}.with_indifferent_access
+    @controller.view_assigns.each { |k, v| assigns.regular_writer(k, v) }
+    key.nil? ? assigns : assigns[key]
+  end
 end