rails-controller-testing 1.0.1 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1985518a366c6d03e6ee96cc506686ac0c2d965d
-  data.tar.gz: 97d894de1d866047e6b8fc0d6055b17f91f7d48c
+SHA256:
+  metadata.gz: 4d99b6d01bc663c3ba220fff707f26552a28a848317c6f830a31e736ddf1776e
+  data.tar.gz: 5d7f585835cdead01990b15b82deef49bcb89f6b717a333ca2111a2df3707262
 SHA512:
-  metadata.gz: 54709c6e0bf1f97d9d35e8c613b6f7990a8e11541601b5f16296604d6a3b4e0ee2c86e6a7f4214bcbb54ecc0f5364bec7d670712a45d85694dbe3671062578ac
-  data.tar.gz: fb983705ffd31ccdc5d93c5b2ebcc478bc08cc2a2bde8d98a8c13068219879f4fbb5716012440de89c7f6323a129cdb2371d1aa37c8f43d3b14d75a776fdc7d4
+  metadata.gz: 3a686dc504025f4b3385d996a5e75b87e72e9485b6aac52b4b94ccab73eb5c7a3835dc716499d52d107272670dd213c459e8c4eaa849128b10de0623835d4267
+  data.tar.gz: 9a568d4d728af230890f59f4bda89c2ce9d351fc30ebb0118b86f642bbd8ffe3ad7cb1f1f5de68780b91edb3b1cfcbeaf2fa464929500c8df4b8d49d3562ba0d

data/README.md

@@ -24,11 +24,11 @@ Or install it yourself as:
 
 See https://github.com/rspec/rspec-rails/issues/1393.
 
-rspec-rails will automatically integrate with this gem once `3.5.0` and Rails 5 are released.
+rspec-rails automatically integrates with this gem since version `3.5.0`.
 Adding the gem to your `Gemfile` is sufficient.
 
-To work around the issue right now, use a beta version of rspec-rails or
-manually you'll have to include the modules in your `rails_helper`.
+If you use an older version of rspec-rails, you can manually include the
+modules in your `rails_helper`.
 
 ```ruby
 RSpec.configure do |config|

data/lib/rails/controller/testing/integration.rb

@@ -1,15 +1,19 @@
+require 'action_pack'
+
 module Rails
   module Controller
     module Testing
       module Integration
-        %w(
-          get post patch put head delete xml_http_request
-          xhr get_via_redirect post_via_redirect
-        ).each do |method|
+        http_verbs = %w(get post patch put head delete)
+
+        if ActionPack.version < Gem::Version.new('5.1')
+          http_verbs.push('xhr', 'xml_http_request', 'get_via_redirect', 'post_via_redirect')
+        end
 
-          define_method(method) do |*args|
+        http_verbs.each do |method|
+          define_method(method) do |*args, **kwargs|
             reset_template_assertion
-            super(*args)
+            super(*args, **kwargs)
           end
         end
       end

data/lib/rails/controller/testing/template_assertions.rb

@@ -51,12 +51,13 @@ module Rails
         end
 
         def teardown_subscriptions
+          return unless defined?(@_subscribers)
           @_subscribers.each do |subscriber|
             ActiveSupport::Notifications.unsubscribe(subscriber)
           end
         end
 
-        def process(*args)
+        def process(*, **)
           reset_template_assertion
           super
         end

data/lib/rails/controller/testing/version.rb

@@ -1,7 +1,7 @@
 module Rails
   module Controller
     module Testing
-      VERSION = "1.0.1"
+      VERSION = "1.0.5"
     end
   end
 end

data/lib/rails/controller/testing.rb

@@ -7,17 +7,19 @@ module Rails
   module Controller
     module Testing
       def self.install
-        ActiveSupport.on_load(:action_controller) do
-          ActionController::TestCase.include Rails::Controller::Testing::TestProcess
-          ActionController::TestCase.include Rails::Controller::Testing::TemplateAssertions
+        ActiveSupport.on_load(:action_controller_test_case) do
+          include Rails::Controller::Testing::TestProcess
+          include Rails::Controller::Testing::TemplateAssertions
+        end
 
-          ActionDispatch::IntegrationTest.include Rails::Controller::Testing::TemplateAssertions
-          ActionDispatch::IntegrationTest.include Rails::Controller::Testing::Integration
-          ActionDispatch::IntegrationTest.include Rails::Controller::Testing::TestProcess
+        ActiveSupport.on_load(:action_dispatch_integration_test) do
+          include Rails::Controller::Testing::TemplateAssertions
+          include Rails::Controller::Testing::Integration
+          include Rails::Controller::Testing::TestProcess
         end
 
-        ActiveSupport.on_load(:action_view) do
-          ActionView::TestCase.include Rails::Controller::Testing::TemplateAssertions
+        ActiveSupport.on_load(:action_view_test_case) do
+          include Rails::Controller::Testing::TemplateAssertions
         end
       end
     end

data/test/controllers/assigns_test.rb

@@ -19,8 +19,8 @@ class AssignsControllerTest < ActionController::TestCase
   def test_view_assigns
     @controller = ViewAssignsController.new
     process :test_assigns
-    assert_equal nil, assigns(:foo)
-    assert_equal nil, assigns[:foo]
+    assert_nil assigns(:foo)
+    assert_nil assigns[:foo]
     assert_equal "bar", assigns(:bar)
     assert_equal "bar", assigns[:bar]
   end

data/test/controllers/template_assertions_test.rb

@@ -12,11 +12,6 @@ class TemplateAssertionsControllerTest < ActionController::TestCase
     assert_template partial: '_partial'
   end
 
-  def test_file_with_absolute_path_success
-    get :render_file_absolute_path
-    assert_template file: File.expand_path('../../dummy/README.rdoc', __FILE__)
-  end
-
   def test_file_with_relative_path_success
     get :render_file_relative_path
     assert_template file: 'README.rdoc'
@@ -28,12 +23,6 @@ class TemplateAssertionsControllerTest < ActionController::TestCase
     assert_raise(ActiveSupport::TestCase::Assertion) do
       assert_template :file => 'test/hello_world'
     end
-
-    get :render_file_absolute_path
-
-    assert_raise(ActiveSupport::TestCase::Assertion) do
-      assert_template file: nil
-    end
   end
 
   def test_with_nil_passes_when_no_template_rendered

data/test/dummy/app/controllers/template_assertions_controller.rb

@@ -20,7 +20,7 @@ class TemplateAssertionsController < ActionController::Base
   end
 
   def render_file_relative_path
-    render file: 'test/dummy/README.rdoc'
+    render file: '/test/dummy/README.rdoc'
   end
 
   def render_with_layout