test: get specs passing again (#34)

G-Rath · web-flow · commit 1d27a05f96f0 · 2025-10-13T13:48:43.000+13:00
* updated the error messages and regexp to account for changes in
Nokogiri
* switched to using `eq` to compare error messages since that gives you
an actual diff
* added `net-smtp` as an explicit dev dependency as it is no longer
being pulled in by `actionmailer`
* added `net-imap` as an explicit dev dependency as v0.5.x requires Ruby
v3.1.0+
* downgraded `actionpack` and `actionmailer` to v7.0.8.4 for now as
`require 'action_mailer/railtie'` errors with a generic "cannot load
file" message
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,22 +7,33 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (0.6.1)
-      actionpack (>= 0.9.5)
-    actionpack (7.0.8.5)
-      actionview (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
+    actionmailer (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      actionview (= 7.0.8.4)
+      activejob (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.8.4)
+      actionview (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.8.5)
-      activesupport (= 7.0.8.5)
+    actionview (7.0.8.4)
+      activesupport (= 7.0.8.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.8.5)
+    activejob (7.0.8.4)
+      activesupport (= 7.0.8.4)
+      globalid (>= 0.3.6)
+    activesupport (7.0.8.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -33,11 +44,14 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.3.4)
     crass (1.0.6)
+    date (3.4.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
     erubi (1.13.0)
     fast_ignore (0.17.4)
-    i18n (1.14.6)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     json (2.6.2)
@@ -53,6 +67,15 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.2)
     minitest (5.25.1)
+    net-imap (0.4.22)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
     nokogiri (1.15.6-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.6-x86_64-linux)
@@ -74,9 +97,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.0.8.5)
-      actionpack (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
+    railties (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -135,6 +158,7 @@ GEM
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.2.1)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
@@ -146,11 +170,13 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  actionmailer
-  activesupport
+  actionmailer (= 7.0.8.4)
+  activesupport (= 7.0.8.4)
   bundler (>= 2.0)
   leftovers
   mail
+  net-imap (< 0.5.0)
+  net-smtp
   pry
   railties
   rake (>= 12.0)
diff --git a/lib/validate_html.rb b/lib/validate_html.rb
@@ -25,10 +25,10 @@ class Error < StandardError; end
   #   #   Parsed using Nokogiri::HTML5::DocumentFragment
   #   #   document saved at: [Configuration#snapshot_path]/1a8ce99806ddeccc3a5f2904ba07c7fa5ae4659d.html
   #   #
-  #   #   1:28: ERROR: That tag isn't allowed here  Currently open tags: html, strong, em.
+  #   #   1:28: ERROR: End tag 'strong' isn't allowed here. Currently open tags: html, strong, em.
   #   #   <strong><em>Very Emphasized</strong></em>
   #   #                              ^
-  #   #   1:37: ERROR: That tag isn't allowed here  Currently open tags: html.
+  #   #   1:37: ERROR: End tag 'em' isn't allowed here. Currently open tags: html.
   #   #   <strong><em>Very Emphasized</strong></em>
   #   #                                       ^
   # @see ValidateHTML.validate_html
@@ -63,10 +63,10 @@ class << self
     #   #   Parsed using Nokogiri::HTML5::DocumentFragment
     #   #   Document saved at: [Configuration#snapshot_path]/1a8ce99806ddeccc3a5f2904ba07c7fa5ae4659d.html
     #   #
-    #   #   1:28: ERROR: That tag isn't allowed here  Currently open tags: html, strong, em.
+    #   #   1:28: ERROR: End tag 'strong' isn't allowed here. Currently open tags: html, strong, em.
     #   #   <strong><em>Very Emphasized</strong></em>
     #   #                              ^
-    #   #   1:37: ERROR: That tag isn't allowed here  Currently open tags: html.
+    #   #   1:37: ERROR: End tag 'em' isn't allowed here. Currently open tags: html.
     #   #   <strong><em>Very Emphasized</strong></em>
     #   #                                       ^
     #
diff --git a/spec/validate_html/active_support_notification_handler_spec.rb b/spec/validate_html/active_support_notification_handler_spec.rb
@@ -15,21 +15,20 @@
       }
 
       expect { described_class.call(nil, nil, nil, nil, payload) }
-        .to raise_error(
-          ValidateHTML::InvalidHTMLError,
-          <<~MESSAGE
+        .to raise_error(ValidateHTML::InvalidHTMLError) do |err|
+          expect(err.message).to eq <<~MESSAGE
             Invalid html
             Parsed using Nokogiri::HTML5::DocumentFragment
             document saved at: #{File.dirname(__dir__)}/tmp/test_snapshots/1a8ce99806ddeccc3a5f2904ba07c7fa5ae4659d.html
 
-            1:28: ERROR: That tag isn't allowed here  Currently open tags: html, strong, em.
+            1:28: ERROR: End tag 'strong' isn't allowed here. Currently open tags: html, strong, em.
             <strong><em>Very Emphasized</strong></em>
                                        ^
-            1:37: ERROR: That tag isn't allowed here  Currently open tags: html.
+            1:37: ERROR: End tag 'em' isn't allowed here. Currently open tags: html.
             <strong><em>Very Emphasized</strong></em>
                                                 ^
           MESSAGE
-        )
+        end
     end
 
     it 'ignores non-turbo payloads' do
diff --git a/spec/validate_html/mailer_observer_spec.rb b/spec/validate_html/mailer_observer_spec.rb
@@ -19,21 +19,20 @@
       stub_config(snapshot_path: snapshot_path)
 
       expect { described_class.perform(html_email) }
-        .to raise_error(
-          ValidateHTML::InvalidHTMLError,
-          <<~MESSAGE
+        .to raise_error(ValidateHTML::InvalidHTMLError) do |err|
+          expect(err.message).to eq <<~MESSAGE
             Invalid html from email The Subject
             Parsed using Nokogiri::HTML5::DocumentFragment
             document saved at: #{File.dirname(__dir__)}/tmp/test_snapshots/1a8ce99806ddeccc3a5f2904ba07c7fa5ae4659d.html
 
-            1:28: ERROR: That tag isn't allowed here  Currently open tags: html, strong, em.
+            1:28: ERROR: End tag 'strong' isn't allowed here. Currently open tags: html, strong, em.
             <strong><em>Very Emphasized</strong></em>
                                        ^
-            1:37: ERROR: That tag isn't allowed here  Currently open tags: html.
+            1:37: ERROR: End tag 'em' isn't allowed here. Currently open tags: html.
             <strong><em>Very Emphasized</strong></em>
                                                 ^
           MESSAGE
-        )
+        end
     end
 
     context 'with valid html' do
diff --git a/spec/validate_html_spec.rb b/spec/validate_html_spec.rb
diff --git a/validate_html.gemspec b/validate_html.gemspec
