dommy-rails 0.13.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: decdc2f02ac2d15f9f1447da1f008fd9b406bb3c423f16c70f7d1c1251d25b45
-  data.tar.gz: 61baf3154db33257f6e508ccc15b21c3274708ad1444fb13495d6bfff2cc4a24
+  metadata.gz: 3e832ec033a262705b85c5c72f9a28595dcb86536a8c4313e85eb306e468a3e1
+  data.tar.gz: 993d8b9e0642c801ac082431027d1c7bcf22b0f29a8235e4be8b02f9b00644d9
 SHA512:
-  metadata.gz: 55439022b061482154d59c057654a8010edf7f7c1cf430cae0edfc4eb91e23822ea779d97acbe128820519642e699c4fd8fa2918e584d05503eae401fb66b3a2
-  data.tar.gz: 5f307f03a7c9b6e745486ca6ef23a882ce0af09abe6d387708b21de98409aae35f6dc8fc90f0074ab62ee2fc947fb9bf7579c6e734383cc81a86eb9fe5d12e3c
+  metadata.gz: 579c17a1fac069aec1c73a8abeb9dbf820296f7e4239d2acd61eee9ae038c9d56772f53860435481ff1a2a75fd77c273fede031ae02c295b272909c46ccdc79f
+  data.tar.gz: 9635048cdd887fe04520855e3e02e95baff0d00f677637447cf565d53fe4f3e2177a911057ed296267117422d41a03b72ff355a3b17293e241047866e0cabb35

data/lib/dommy/rails/aria_snapshot_matching.rb

@@ -38,14 +38,10 @@ module Dommy
       # Greedy ordered-subsequence match: each expected child must match a later
       # actual child, allowing extra actual children in between.
       def children_match?(expected_children, actual_children)
-        cursor = 0
-        expected_children.each do |expected|
-          cursor += 1 until cursor >= actual_children.size || node_match?(expected, actual_children[cursor])
-          return false if cursor >= actual_children.size
-
-          cursor += 1
+        remaining = actual_children.each
+        expected_children.all? do |expected|
+          remaining.any? { |actual| node_match?(expected, actual) }
         end
-        true
       end
 
       # --- parsing (indentation outline -> Node tree) ---

data/lib/dommy/rails/browser_spec.rb

@@ -25,7 +25,7 @@ module Dommy
       def self.included(base)
         if base.respond_to?(:after)
           base.after do |example|
-            dir = dommy_browser_after(failed: example.exception ? true : false,
+            dir = dommy_browser_after(failed: !!example.exception,
               label: example.full_description, exception: example.exception)
             # Point the failure output at the saved bundle and the one command
             # that opens it in the standalone viewer.

data/lib/dommy/rails/lint.rb

@@ -13,9 +13,9 @@ module Dommy
       module_function
 
       def duplicate_ids(document)
-        all_elements = document.query_selector_all("*[id]").to_a
-        ids = all_elements.map { |el| el.get_attribute("id") }
-        ids.select { |id| ids.count(id) > 1 }.uniq
+        document.query_selector_all("*[id]").to_a
+          .map { |el| el.get_attribute("id") }
+          .tally.select { |_, count| count > 1 }.keys
       end
 
       def invalid_aria_references(document)

data/lib/dommy/rails/mail_part.rb

@@ -8,25 +8,25 @@ module Dommy
       module_function
 
       def html_body(mail)
-        if mail.respond_to?(:html_part) && mail.html_part
-          mail.html_part.body.to_s
-        elsif mail.respond_to?(:body)
-          mail.body.to_s
-        end
+        part_body(mail, :html_part)
       end
 
       def plain_body(mail)
-        if mail.respond_to?(:text_part) && mail.text_part
-          mail.text_part.body.to_s
-        elsif mail.respond_to?(:body)
-          mail.body.to_s
-        end
+        part_body(mail, :text_part)
       end
 
       def html_document(mail)
         body = html_body(mail)
         body ? Dommy.parse(body).document : nil
       end
+
+      def part_body(mail, part_name)
+        part = mail.public_send(part_name) if mail.respond_to?(part_name)
+        return part.body.to_s if part
+
+        mail.body.to_s if mail.respond_to?(:body)
+      end
+      private_class_method :part_body
     end
   end
 end

data/lib/dommy/rails/minitest/assertions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dommy
   module Rails
     module Minitest

data/lib/dommy/rails/minitest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "dommy/minitest"
 require_relative "../rails"
 require_relative "minitest/assertions"

data/lib/dommy/rails/rspec/matchers.rb

@@ -120,7 +120,18 @@ module Dommy
           HavePlainText.new(text)
         end
 
+        # Negation is always the inverse of the positive match, so every
+        # matcher gets `does_not_match?` from here and only implements
+        # `matches?` plus its failure messages.
+        module Negatable
+          def does_not_match?(actual)
+            !matches?(actual)
+          end
+        end
+
         class HaveForm
+          include Negatable
+
           def initialize(action:, method:, model:)
             @action = action
             @method = method
@@ -132,10 +143,6 @@ module Dommy
             Dommy::Rails::FormInspector.matches?(@document, action: @action, method: @method, model: @model)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have form #{criteria_description}"
           end
@@ -160,6 +167,8 @@ module Dommy
         end
 
         class HaveXPath
+          include Negatable
+
           def initialize(expression, text:, count:)
             @expression = expression
             @text = text
@@ -171,10 +180,6 @@ module Dommy
             Dommy::Internal::DomMatching.count_matches?(@matched.size, @count)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have XPath #{@expression.inspect}"
           end
@@ -189,6 +194,8 @@ module Dommy
         end
 
         class HaveTitle
+          include Negatable
+
           def initialize(expected)
             @expected = expected
           end
@@ -198,10 +205,6 @@ module Dommy
             Dommy::Rails::PageInspector.title_matches?(@document, @expected)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have title #{@expected.inspect}"
           end
@@ -219,6 +222,8 @@ module Dommy
         # snapshot (its nodes must appear in the actual tree, in order); names
         # may be `/regex/`.
         class MatchAriaSnapshot
+          include Negatable
+
           def initialize(expected)
             @expected = expected
           end
@@ -228,10 +233,6 @@ module Dommy
             Dommy::Rails::AriaSnapshotMatching.matches?(@actual, @expected)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "match aria snapshot"
           end
@@ -246,6 +247,8 @@ module Dommy
         end
 
         class HaveMeta
+          include Negatable
+
           def initialize(name:, property:, content:)
             @name = name
             @property = property
@@ -256,10 +259,6 @@ module Dommy
             Dommy::Rails::PageInspector.meta_matches?(MatchTarget.document(actual), name: @name, property: @property, content: @content)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have meta #{criteria_description}"
           end
@@ -284,14 +283,12 @@ module Dommy
         end
 
         class HaveCsrfMetaTags
+          include Negatable
+
           def matches?(actual)
             Dommy::Rails::PageInspector.csrf_meta_tags?(MatchTarget.document(actual))
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have Rails CSRF meta tags"
           end
@@ -306,14 +303,12 @@ module Dommy
         end
 
         class HaveAuthenticityToken
+          include Negatable
+
           def matches?(actual)
             Dommy::Rails::PageInspector.authenticity_token?(MatchTarget.document(actual))
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have Rails authenticity token field"
           end
@@ -328,6 +323,8 @@ module Dommy
         end
 
         class HaveLink
+          include Negatable
+
           def initialize(text, href:, count:)
             @text = text
             @href = href
@@ -339,10 +336,6 @@ module Dommy
             Dommy::Internal::DomMatching.count_matches?(@matched.size, @count)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have link"
           end
@@ -357,6 +350,8 @@ module Dommy
         end
 
         class HaveTurboFrame
+          include Negatable
+
           def initialize(id, text:, count:)
             @id = id
             @text = text
@@ -370,10 +365,6 @@ module Dommy
             ok
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have turbo-frame#{@id ? " ##{@id}" : ""}"
           end
@@ -388,6 +379,8 @@ module Dommy
         end
 
         class HaveSelect
+          include Negatable
+
           def initialize(name, label:, count:)
             @name = name
             @label = label
@@ -399,10 +392,6 @@ module Dommy
             Dommy::Internal::DomMatching.count_matches?(@matched.size, @count)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have select"
           end
@@ -417,6 +406,8 @@ module Dommy
         end
 
         class HaveCheckableField
+          include Negatable
+
           def initialize(name, checked:)
             @name = name
             @checked = checked
@@ -427,10 +418,6 @@ module Dommy
             @matched.any?
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have #{@checked ? 'checked' : 'unchecked'} field"
           end
@@ -445,6 +432,8 @@ module Dommy
         end
 
         class HaveTurboStream
+          include Negatable
+
           def initialize(action:, target:)
             @action = action
             @target = target
@@ -456,10 +445,6 @@ module Dommy
             !stream.nil?
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have turbo-stream action=#{@action.inspect} target=#{@target.inspect}"
           end
@@ -474,6 +459,8 @@ module Dommy
         end
 
         class HaveStimulusController
+          include Negatable
+
           def initialize(name)
             @name = name
           end
@@ -482,10 +469,6 @@ module Dommy
             Dommy::Rails::Stimulus.controller?(MatchTarget.document(actual), @name)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have Stimulus controller #{@name.inspect}"
           end
@@ -500,6 +483,8 @@ module Dommy
         end
 
         class HaveStimulusAction
+          include Negatable
+
           def initialize(action)
             @action = action
           end
@@ -508,10 +493,6 @@ module Dommy
             Dommy::Rails::Stimulus.action?(MatchTarget.document(actual), @action)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have Stimulus action #{@action.inspect}"
           end
@@ -526,6 +507,8 @@ module Dommy
         end
 
         class HaveStimulusTarget
+          include Negatable
+
           def initialize(controller, target)
             @controller = controller
             @target = target
@@ -535,10 +518,6 @@ module Dommy
             Dommy::Rails::Stimulus.target?(MatchTarget.document(actual), @controller, @target)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have Stimulus target #{@controller.inspect}.#{@target.inspect}"
           end
@@ -553,6 +532,8 @@ module Dommy
         end
 
         class HaveStimulusValue
+          include Negatable
+
           def initialize(controller, key, value)
             @controller = controller
             @key = key
@@ -563,10 +544,6 @@ module Dommy
             Dommy::Rails::Stimulus.value?(MatchTarget.document(actual), @controller, @key, @value)
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have Stimulus value #{@controller.inspect}.#{@key.inspect}"
           end
@@ -581,15 +558,13 @@ module Dommy
         end
 
         class HaveNoDuplicateIds
+          include Negatable
+
           def matches?(actual)
             @issues = Dommy::Rails::Lint.duplicate_ids(MatchTarget.document(actual))
             @issues.empty?
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have no duplicate ids"
           end
@@ -604,15 +579,13 @@ module Dommy
         end
 
         class HaveNoInvalidAriaReferences
+          include Negatable
+
           def matches?(actual)
             @issues = Dommy::Rails::Lint.invalid_aria_references(MatchTarget.document(actual))
             @issues.empty?
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have no invalid ARIA references"
           end
@@ -627,15 +600,13 @@ module Dommy
         end
 
         class HaveNoMissingFormLabels
+          include Negatable
+
           def matches?(actual)
             @issues = Dommy::Rails::Lint.missing_form_labels(MatchTarget.document(actual))
             @issues.empty?
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have no missing form labels"
           end
@@ -650,15 +621,13 @@ module Dommy
         end
 
         class HaveNoEmptyLinks
+          include Negatable
+
           def matches?(actual)
             @issues = Dommy::Rails::Lint.empty_links(MatchTarget.document(actual))
             @issues.empty?
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have no empty links"
           end
@@ -673,15 +642,13 @@ module Dommy
         end
 
         class HaveNoNestedInteractiveElements
+          include Negatable
+
           def matches?(actual)
             @issues = Dommy::Rails::Lint.nested_interactive_elements(MatchTarget.document(actual))
             @issues.empty?
           end
 
-          def does_not_match?(actual)
-            !matches?(actual)
-          end
-
           def description
             "have no nested interactive elements"
           end
@@ -696,6 +663,8 @@ module Dommy
         end
 
         class HaveHtmlLink
+          include Negatable
+
           def initialize(text, href:, count:)
             @text = text
             @href = href
@@ -710,10 +679,6 @@ module Dommy
             Dommy::Internal::DomMatching.count_matches?(@matched.size, @count)
           end
 
-          def does_not_match?(mail)
-            !matches?(mail)
-          end
-
           def description
             "have HTML link"
           end
@@ -730,6 +695,8 @@ module Dommy
         end
 
         class HaveHtmlText
+          include Negatable
+
           def initialize(text)
             @text = text
           end
@@ -742,10 +709,6 @@ module Dommy
             Dommy::Internal::DomMatching.text_matches?(@actual, @text)
           end
 
-          def does_not_match?(mail)
-            !matches?(mail)
-          end
-
           def description
             "have HTML text #{@text.inspect}"
           end
@@ -762,6 +725,8 @@ module Dommy
         end
 
         class HavePlainText
+          include Negatable
+
           def initialize(text)
             @text = text
           end
@@ -771,10 +736,6 @@ module Dommy
             Dommy::Internal::DomMatching.text_matches?(@actual, @text)
           end
 
-          def does_not_match?(mail)
-            !matches?(mail)
-          end
-
           def description
             "have plain text #{@text.inspect}"
           end

data/lib/dommy/rails/url_normalizer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "cgi"
+require "cgi/escape"
 require "uri"
 
 module Dommy
@@ -32,7 +32,7 @@ module Dommy
         path = path.chomp("/") unless path == "/"
 
         query = if uri.query
-          params = URI.decode_www_form(uri.query).sort_by { |k, _| k }
+          params = URI.decode_www_form(uri.query).sort_by(&:first)
           URI.encode_www_form(params)
         end
 

data/lib/dommy/rails/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Dommy
   module Rails
-    VERSION = "0.13.0"
+    VERSION = "0.15.0"
   end
 end

data/lib/dommy/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "dommy"
 require_relative "rails/version"
 require_relative "rails/form_inspector"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dommy-rails
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - takahashim
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.15.0
 description: Rails-specific matchers and assertions for Dommy, including form helper
   understanding, Turbo Stream support, Stimulus attribute checking, and HTML quality
   linting.
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Rails integration for Dommy DOM testing
 test_files: []