And Rails 7 checks, plus remove unnecessary stunts in helper

Author: lcreid

test/bootstrap_fields_test.rb

@@ -29,7 +29,7 @@ class BootstrapFieldsTest < ActionView::TestCase
     expected = <<~HTML
       <div class="mb-3">
         <label class="form-label" for="user_misc">Misc</label>
-        <input class="form-control" id="user_misc" name="user[misc]" type="datetime" />
+        <input class="form-control" id="user_misc" name="user[misc]" type="datetime-local" />
       </div>
     HTML
     assert_equivalent_html expected, @builder.datetime_field(:misc)

test/bootstrap_rich_text_area_test.rb

@@ -8,23 +8,13 @@ class BootstrapRichTextAreaTest < ActionView::TestCase
   setup :setup_test_fixture
 
   test "rich text areas are wrapped correctly" do
-    if ::Rails::VERSION::STRING >= "7"
-      expected = nil
-      with_stub_token do
-        expected = <<~HTML
-          <div class="mb-3">
-            <label class="form-label" for="user_life_story">Life story</label>
-            <input autocomplete="off" type="hidden" name="user[life_story]" id="user_life_story_trix_input_user"/>
-            <trix-editor class="trix-content form-control" extra="extra arg" data-blob-url-template="http://test.host/rails/active_storage/blobs/redirect/:signed_id/:filename" data-direct-upload-url="http://test.host/rails/active_storage/direct_uploads" id="user_life_story" input="user_life_story_trix_input_user"/>
-          </div>
-        HTML
-      end
-    else
+    expected = nil
+    with_stub_token do
       expected = <<~HTML
         <div class="mb-3">
           <label class="form-label" for="user_life_story">Life story</label>
-          <input #{autocomplete_attr} type="hidden" name="user[life_story]" id="user_life_story_trix_input_user"/>
-          <trix-editor id="user_life_story" extra="extra arg" data-blob-url-template="#{data_blob_url_template}" data-direct-upload-url="http://test.host/rails/active_storage/direct_uploads" input="user_life_story_trix_input_user" class="trix-content form-control" />
+          <input autocomplete="off" type="hidden" name="user[life_story]" id="user_life_story_trix_input_user"/>
+          <trix-editor class="trix-content form-control" extra="extra arg" data-blob-url-template="http://test.host/rails/active_storage/blobs/redirect/:signed_id/:filename" data-direct-upload-url="http://test.host/rails/active_storage/direct_uploads" id="user_life_story" input="user_life_story_trix_input_user"/>
         </div>
       HTML
     end

test/test_helper.rb

@@ -85,20 +85,8 @@ def assert_equivalent_html(expected, actual)
   def equivalent_with_looser_criteria?(expected, real, result)
     return result if result
 
-    if real.attr(:name) == "utf8"
-      # Handle wrapped utf8 hidden field for Rails 4.2+
-      expected = expected.child
-    end
-
     real.delete("data-disable-with")
 
-    if expected.is_a?(Nokogiri::XML::Attr) &&
-       real.is_a?(Nokogiri::XML::Attr) &&
-       expected.value == "datetime" &&
-       real.value == "datetime-local"
-      return true
-    end
-
     EquivalentXml.equivalent?(expected, real, element_order: true)
   end