Upgrade rails-dom-testing test dependency

On the heels of [rails/rails-dom-testing#91][] and
[rails/rails-dom-testing#93][], and in preparation for
[rails/rails-dom-testing#92][]

[rails/rails-dom-testing#91]: rails/rails-dom-testing#91
[rails/rails-dom-testing#92]: rails/rails-dom-testing#92
[rails/rails-dom-testing#93]: rails/rails-dom-testing#93

Author: seanpdoyle

Gemfile

@@ -113,6 +113,7 @@ group :test do
   gem "minitest-bisect"
   gem "minitest-retry"
   gem "minitest-reporters"
+  gem "rails-dom-testing", github: "rails/rails-dom-testing", branch: "master"
 
   platforms :mri do
     gem "stackprof"

Gemfile.lock

@@ -20,6 +20,15 @@ GIT
       event_emitter
       websocket
 
+GIT
+  remote: https://github.com/rails/rails-dom-testing.git
+  revision: 267487e20588d3848def3f8a3663fba5b740c9da
+  branch: master
+  specs:
+    rails-dom-testing (2.0.3)
+      activesupport (>= 5.0.0)
+      nokogiri (>= 1.6)
+
 GIT
   remote: https://github.com/resque/redis-namespace.git
   revision: c31e63dc3cd5e59ef5ea394d4d46ac60d1e6f82e
@@ -388,6 +397,7 @@ GEM
       thor
     raabro (1.4.0)
     racc (1.5.2)
+    racc (1.5.2-java)
     rack (2.2.3)
     rack-cache (1.12.1)
       rack (>= 0.4)
@@ -397,9 +407,6 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rainbow (3.0.0)
@@ -553,6 +560,8 @@ GEM
     websocket (1.2.9)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
+    websocket-driver (0.7.3-java)
+      websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
@@ -606,6 +615,7 @@ DEPENDENCIES
   racc (>= 1.4.6)
   rack-cache (~> 1.2)
   rails!
+  rails-dom-testing!
   rake (>= 11.1)
   redcarpet (~> 3.2.3)
   redis (~> 4.0)

actionmailer/test/assert_select_email_test.rb

@@ -20,29 +20,29 @@ def test(options)
   end
 
   #
-  # Test assert_select_email
+  # Test assert_dom_email
   #
 
-  def test_assert_select_email
+  def test_assert_dom_email
     assert_raise ActiveSupport::TestCase::Assertion do
-      assert_select_email { }
+      assert_dom_email { }
     end
 
     AssertSelectMailer.test("<div><p>foo</p><p>bar</p></div>").deliver_now
-    assert_select_email do
-      assert_select "div:root" do
-        assert_select "p:first-child", "foo"
-        assert_select "p:last-child", "bar"
+    assert_dom_email do
+      assert_dom "div:root" do
+        assert_dom "p:first-child", "foo"
+        assert_dom "p:last-child", "bar"
       end
     end
   end
 
-  def test_assert_select_email_multipart
+  def test_assert_dom_email_multipart
     AssertMultipartSelectMailer.test(html: "<div><p>foo</p><p>bar</p></div>", text: "foo bar").deliver_now
-    assert_select_email do
-      assert_select "div:root" do
-        assert_select "p:first-child", "foo"
-        assert_select "p:last-child", "bar"
+    assert_dom_email do
+      assert_dom "div:root" do
+        assert_dom "p:first-child", "foo"
+        assert_dom "p:last-child", "bar"
       end
     end
   end

actionpack/CHANGELOG.md

@@ -1,15 +1,20 @@
+*   Upgrade `rails-dom-testing` dependency, and rename all `assert_select` calls
+    and documentation mentions with `assert_dom`.
+
+    *Sean Doyle*
+
 *   Add `ActionController::Live#send_stream` that makes it more convenient to send generated streams:
 
     ```ruby
     send_stream(filename: "subscribers.csv") do |stream|
       stream.write "email_address,updated_at\n"
-    
+
       @subscribers.find_each do |subscriber|
         stream.write "#{subscriber.email_address},#{subscriber.updated_at}\n"
       end
     end
     ```
-    
+
     *DHH*
 
 *   `ActionDispatch::Request#content_type` now returned Content-Type header as it is.

actionpack/lib/action_dispatch/testing/integration.rb

@@ -532,7 +532,7 @@ def method_missing(method, *args, &block)
   #       https!(false)
   #       get "/articles/all"
   #       assert_response :success
-  #       assert_select 'h1', 'Articles'
+  #       assert_dom 'h1', 'Articles'
   #     end
   #   end
   #
@@ -571,7 +571,7 @@ def method_missing(method, *args, &block)
   #         def browses_site
   #           get "/products/all"
   #           assert_response :success
-  #           assert_select 'h1', 'Products'
+  #           assert_dom 'h1', 'Products'
   #         end
   #       end
   #

actionpack/test/controller/caching_test.rb

@@ -443,17 +443,17 @@ def test_collection_fetches_cached_views
   def test_preserves_order_when_reading_from_cache_plus_rendering
     get :index, params: { id: 2 }
     assert_equal 1, @controller.partial_rendered_times
-    assert_select ":root", "david, 2"
+    assert_dom ":root", "david, 2"
 
     get :index_ordered
     assert_equal 3, @controller.partial_rendered_times
-    assert_select ":root", "david, 1\n  david, 2\n  david, 3"
+    assert_dom ":root", "david, 1\n  david, 2\n  david, 3"
   end
 
   def test_explicit_render_call_with_options
     get :index_explicit_render_in_controller
 
-    assert_select ":root", "david, 1"
+    assert_dom ":root", "david, 1"
   end
 
   def test_caching_works_with_beginning_comment

actionpack/test/controller/request_forgery_protection_test.rb

@@ -192,7 +192,7 @@ def test_should_render_form_with_token_tag
       assert_not_blocked do
         get :index
       end
-      assert_select "form>input[name=?][value=?]", "custom_authenticity_token", @token
+      assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", @token
     end
   end
 
@@ -201,7 +201,7 @@ def test_should_render_button_to_with_token_tag
       assert_not_blocked do
         get :show_button
       end
-      assert_select "form>input[name=?][value=?]", "custom_authenticity_token", @token
+      assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", @token
     end
   end
 
@@ -232,7 +232,7 @@ def test_should_render_form_with_token_tag_if_remote_and_external_authenticity_t
       assert_not_blocked do
         get :form_for_remote_with_external_token
       end
-      assert_select "form>input[name=?][value=?]", "custom_authenticity_token", "external_token"
+      assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", "external_token"
     ensure
       ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms = original
     end
@@ -242,15 +242,15 @@ def test_should_render_form_with_token_tag_if_remote_and_external_authenticity_t
     assert_not_blocked do
       get :form_for_remote_with_external_token
     end
-    assert_select "form>input[name=?][value=?]", "custom_authenticity_token", "external_token"
+    assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", "external_token"
   end
 
   def test_should_render_form_with_token_tag_if_remote_and_authenticity_token_requested
     @controller.stub :form_authenticity_token, @token do
       assert_not_blocked do
         get :form_for_remote_with_token
       end
-      assert_select "form>input[name=?][value=?]", "custom_authenticity_token", @token
+      assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", @token
     end
   end
 
@@ -259,7 +259,7 @@ def test_should_render_form_with_token_tag_with_authenticity_token_requested
       assert_not_blocked do
         get :form_for_with_token
       end
-      assert_select "form>input[name=?][value=?]", "custom_authenticity_token", @token
+      assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", @token
     end
   end
 
@@ -290,7 +290,7 @@ def test_should_render_form_with_with_token_tag_if_remote_and_external_authentic
       assert_not_blocked do
         get :form_with_remote_with_external_token
       end
-      assert_select "form>input[name=?][value=?]", "custom_authenticity_token", "external_token"
+      assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", "external_token"
     ensure
       ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms = original
     end
@@ -300,15 +300,15 @@ def test_should_render_form_with_with_token_tag_if_remote_and_external_authentic
     assert_not_blocked do
       get :form_with_remote_with_external_token
     end
-    assert_select "form>input[name=?][value=?]", "custom_authenticity_token", "external_token"
+    assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", "external_token"
   end
 
   def test_should_render_form_with_with_token_tag_if_remote_and_authenticity_token_requested
     @controller.stub :form_authenticity_token, @token do
       assert_not_blocked do
         get :form_with_remote_with_token
       end
-      assert_select "form>input[name=?][value=?]", "custom_authenticity_token", @token
+      assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", @token
     end
   end
 
@@ -317,7 +317,7 @@ def test_should_render_form_with_with_token_tag_with_authenticity_token_requeste
       assert_not_blocked do
         get :form_with_local_with_token
       end
-      assert_select "form>input[name=?][value=?]", "custom_authenticity_token", @token
+      assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", @token
     end
   end
 
@@ -331,7 +331,7 @@ def test_should_render_form_with_with_token_tag_if_remote_and_embedding_token_is
           get :form_with_remote
         end
       end
-      assert_select "form>input[name=?][value=?]", "custom_authenticity_token", @token
+      assert_dom "form>input[name=?][value=?]", "custom_authenticity_token", @token
     ensure
       ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms = original
     end
@@ -663,8 +663,8 @@ class RequestForgeryProtectionControllerUsingResetSessionTest < ActionController
   test "should emit a csrf-param meta tag and a csrf-token meta tag" do
     @controller.stub :form_authenticity_token, @token + "<=?" do
       get :meta
-      assert_select "meta[name=?][content=?]", "csrf-param", "custom_authenticity_token"
-      assert_select "meta[name=?]", "csrf-token"
+      assert_dom "meta[name=?][content=?]", "csrf-param", "custom_authenticity_token"
+      assert_dom "meta[name=?]", "csrf-token"
       regexp = "#{@token}&lt;=\?"
       assert_match(/#{regexp}/, @response.body)
     end
@@ -753,14 +753,14 @@ def setup
   def test_should_not_render_form_with_token_tag
     SecureRandom.stub :urlsafe_base64, @token do
       get :index
-      assert_select "form>div>input[name=?][value=?]", "authenticity_token", @token, false
+      assert_dom "form>div>input[name=?][value=?]", "authenticity_token", @token, false
     end
   end
 
   def test_should_not_render_button_to_with_token_tag
     SecureRandom.stub :urlsafe_base64, @token do
       get :show_button
-      assert_select "form>div>input[name=?][value=?]", "authenticity_token", @token, false
+      assert_dom "form>div>input[name=?][value=?]", "authenticity_token", @token, false
     end
   end
 
@@ -1063,7 +1063,7 @@ def test_method_is_case_insensitive
 
   private
     def assert_presence_and_fetch_form_csrf_token
-      assert_select 'input[name="custom_authenticity_token"]' do |input|
+      assert_dom 'input[name="custom_authenticity_token"]' do |input|
         form_csrf_token = input.first["value"]
         assert_not_nil form_csrf_token
         return form_csrf_token

actionpack/test/controller/test_case_test.rb

@@ -200,17 +200,17 @@ def default_url_options
     end
   end
 
-  def test_assert_select_without_body
+  def test_assert_dom_without_body
     get :test_without_body
 
-    assert_select "body", 0
-    assert_select "div.foo"
+    assert_dom "body", 0
+    assert_dom "div.foo"
   end
 
-  def test_assert_select_with_body
+  def test_assert_dom_with_body
     get :test_with_body
 
-    assert_select "body.foo"
+    assert_dom "body.foo"
   end
 
   def test_url_options_reset
@@ -407,17 +407,17 @@ def test_should_impose_childless_html_tags_in_html
     if defined?(JRUBY_VERSION)
       # https://github.com/sparklemotion/nokogiri/issues/1653
       # HTML parser "fixes" "broken" markup in slightly different ways
-      assert_select "root > map > area + p"
+      assert_dom "root > map > area + p"
     else
-      assert_select "root > area + p"
+      assert_dom "root > area + p"
     end
   end
 
   def test_should_not_impose_childless_html_tags_in_xml
     process :test_xml_output, params: { response_as: "application/xml" }
 
     # <area> is not special, so the <p> is its child
-    assert_select "root > area > p"
+    assert_dom "root > area > p"
   end
 
   def test_assert_generates