unify into ActionView::-scoped assertions

rails · Dec 1, 2023 · fa8c2a6 · fa8c2a6
1 parent 4c76202
commit fa8c2a6
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 48 deletions.
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
@@ -148,9 +148,11 @@ class Railtie < Rails::Railtie # :nodoc:
 
         case assertions
         when :capybara
-          include ActionDispatch::CapybaraAssertions
+          include ActionView::CapybaraAssertions
         when :rails_dom_testing
-          include ActionDispatch::RailsDomTestingAssertions
+          include ActionView::RailsDomTestingAssertions
+        when :none
+          # do nothing
         else
           raise ArgumentError.new("unrecognized value #{assertions.inspect} for config.action_controller.assertions")
         end

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
@@ -121,8 +121,6 @@ def self.resolve_store(session_store) # :nodoc:
 
   autoload_under "testing" do
     autoload :Assertions
-    autoload :CapybaraAssertions
-    autoload :RailsDomTestingAssertions
     autoload :Integration
     autoload :IntegrationTest, "action_dispatch/testing/integration"
     autoload :TestProcess

diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
@@ -78,9 +78,11 @@ class Railtie < Rails::Railtie # :nodoc:
       ActiveSupport.on_load(:action_dispatch_integration_test) do
         case assertions
         when :capybara
-          include ActionDispatch::CapybaraAssertions
+          include ActionView::CapybaraAssertions
         when :rails_dom_testing
-          include ActionDispatch::RailsDomTestingAssertions
+          include ActionView::RailsDomTestingAssertions
+        when :none
+          # do nothing
         else
           raise ArgumentError.new("unrecognized value #{assertions.inspect} for config.action_dispatch.assertions")
         end

diff --git a/actionpack/lib/action_dispatch/testing/capybara_assertions.rb b/actionpack/lib/action_dispatch/testing/capybara_assertions.rb
diff --git a/actionpack/lib/action_dispatch/testing/rails_dom_testing_assertions.rb b/actionpack/lib/action_dispatch/testing/rails_dom_testing_assertions.rb
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
@@ -112,11 +112,11 @@ def config
 end
 
 ActiveSupport.on_load :action_controller_test_case do
-  include ActionDispatch::RailsDomTestingAssertions
+  include ActionView::RailsDomTestingAssertions
 end
 
 class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
-  include ActionDispatch::RailsDomTestingAssertions
+  include ActionView::RailsDomTestingAssertions
 
   def self.build_app(routes = nil)
     RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|

diff --git a/actionpack/test/dispatch/capybara_assertions_test.rb b/actionpack/test/dispatch/capybara_assertions_test.rb
@@ -9,7 +9,7 @@ def create
 end
 
 class ControllerCapybaraAssertionsTest < ActionController::TestCase
-  include ActionDispatch::CapybaraAssertions
+  include ActionView::CapybaraAssertions
 
   setup do
     @controller = RendersController.new
@@ -75,7 +75,7 @@ class ControllerCapybaraAssertionsTest < ActionController::TestCase
 end
 
 class IntegrationCapybaraAssertionsTest < ActionDispatch::IntegrationTest
-  include ActionDispatch::CapybaraAssertions
+  include ActionView::CapybaraAssertions
 
   APP = build_app(ActionDispatch::Routing::RouteSet.new.tap { |routes|
     routes.draw { post "/", to: "renders#create" }

diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb
@@ -115,6 +115,8 @@ class Railtie < Rails::Engine # :nodoc:
           include ActionView::CapybaraAssertions
         when :rails_dom_testing
           include ActionView::RailsDomTestingAssertions
+        when :none
+          # do nothing
         else
           raise ArgumentError.new("unrecognized value #{assertions.inspect} for config.action_view.assertions")
         end

diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
@@ -106,7 +106,7 @@ def config
 end
 
 class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
-  include ActionDispatch::RailsDomTestingAssertions
+  include ActionView::RailsDomTestingAssertions
 
   def self.build_app(routes = nil)
     routes ||= ActionDispatch::Routing::RouteSet.new.tap { |rs|
@@ -151,7 +151,7 @@ def self.test_routes(&block)
 
   class TestCase
     include ActionDispatch::TestProcess
-    include ActionDispatch::RailsDomTestingAssertions
+    include ActionView::RailsDomTestingAssertions
 
     def self.with_routes(&block)
       routes = ActionDispatch::Routing::RouteSet.new

diff --git a/guides/source/configuring.md b/guides/source/configuring.md
@@ -1664,6 +1664,8 @@ When set to `:rails_dom_testing`, tests will have access to assertions provided
 
 When set to `:capybara`, tests will have access to assertions provided by the [capybara](https://rubydoc.info/github/teamcapybara/capybara/master/Capybara/Minitest/Assertions) gem.
 
+When set to `:none`, tests won't include any built-in assertions.
+
 Defaults to `:rails_dom_testing`.
 
 #### `config.action_controller.asset_host`
@@ -1820,6 +1822,8 @@ When set to `:rails_dom_testing`, tests will have access to assertions provided
 
 When set to `:capybara`, tests will have access to assertions provided by the [capybara](https://rubydoc.info/github/teamcapybara/capybara/master/Capybara/Minitest/Assertions) gem.
 
+When set to `:none`, tests won't include any built-in assertions.
+
 Defaults to `:rails_dom_testing`.
 
 #### `config.action_dispatch.cookies_serializer`
@@ -2028,6 +2032,8 @@ When set to `:rails_dom_testing`, tests will have access to assertions provided
 
 When set to `:capybara`, tests will have access to assertions provided by the [capybara](https://rubydoc.info/github/teamcapybara/capybara/master/Capybara/Minitest/Assertions) gem.
 
+When set to `:none`, tests won't include any built-in assertions.
+
 Defaults to `:rails_dom_testing`.
 
 #### `config.action_view.cache_template_loading`

diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
@@ -25,7 +25,7 @@ class ActiveSupport::TestCase
 end
 
 ActiveSupport.on_load(:action_controller_test_case) do
-  include ActionDispatch::RailsDomTestingAssertions
+  include ActionView::RailsDomTestingAssertions
 end
 
 require_relative "../../tools/test_common"