rspec-html 0.2.8 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a271ab933a02e1c5456ea472551e09d194132d79d9f47924cc8aa9cc4ae9c832
-  data.tar.gz: 230f1ae1e54404f1766b909074bea3d0b83d748f8a57a7df9c497a60137c4fc4
+  metadata.gz: 8052637b48c07f5312c3c0f6c4f3c42b790691758ab66b92240509bc19512b78
+  data.tar.gz: 28332c0112b53c97613bb24f387d6b9cef099527d363416856a44eab9e9f7260
 SHA512:
-  metadata.gz: ad8a71ee657b000eb1b334d365da8f723ec0466c69aa7580b8104c87aae23066ca703cdbbea3717ac3b422fb57b59c8784ecef4a8eeb3366a0f719bd5f2808eb
-  data.tar.gz: a1eeede78f3c7bddc433c2162c4355779c55bd9c6c0ce984f42ad347eaef3e8c5cc22e7b78dbe29450a353c8acd679a24acaccd4a6add6981223ba90eaf45901
+  metadata.gz: aa6583f785fd6e9da9e0a6c6d2a06e4f262e749e75d99e7a808fb937c3d08c882366424ffffcaf70e7d19de44027064435148ac9a8c9b3d4607ca67f218e5377
+  data.tar.gz: 419571c56771c6c5b46a7197ce3f8f3cb866c00e0db54201c1106e9f2105099c78461feb719b81ddf5d924b6098859f57e5c4107140583805ba84b3c6555a2d5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-html (0.2.8)
+    rspec-html (0.2.11)
       nokogiri (~> 1.10)
       rspec (~> 3.0)
 
@@ -14,7 +14,7 @@ GEM
     diff-lcs (1.5.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    nokogiri (1.13.5-x86_64-linux)
+    nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     paint (2.2.1)
     parallel (1.22.1)

data/README.md

@@ -7,7 +7,7 @@ _RSpec::HTML_ provides a simple object interface to HTML responses from [_RSpec
 Add the gem to your `Gemfile`:
 
 ```ruby
-gem 'rspec-html', '~> 0.2.8'
+gem 'rspec-html', '~> 0.2.11'
 ```
 
 And rebuild your bundle:
@@ -41,6 +41,11 @@ it 'says hello' do
 end
 ```
 
+This method can also be used for _ActionMailer_ emails:
+```ruby
+before { parse_html(ActionMailer::Base.deliveries.last.body.decoded) }
+```
+
 To navigate the _DOM_ by a sequence of tag names use chained method calls on the `document` object:
 
 #### Tag Traversal
@@ -63,6 +68,17 @@ expect(document.body.div(id: 'my-div').span(class: 'my-class my-other-class')).t
 
 Classes can be provided in any order, i.e. `'my-class my-other-class'` is equivalent to `'my-other-class my-class'`.
 
+#### Simple CSS Matching
+To use a simple CSS selector when no other attributes are needed, pass a string to the tag method:
+```ruby
+expect(document.body.div('#my-id.my-class1.my-class2')).to contain_text 'some text'
+```
+
+This is effectively shorthand for:
+```ruby
+expect(document.body.div(id: 'my-id', class: 'my-class1 my-class2')).to contain_text 'some text'
+```
+
 #### Text Matching
 To select an element that includes a given text string (i.e. excluding mark-up) use the `text` option:
 ```ruby

data/lib/rspec/html/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module HTML
-    VERSION = '0.2.8'
+    VERSION = '0.2.11'
   end
 end

data/lib/rspec_html/element.rb

@@ -8,7 +8,10 @@ module RSpecHTML
     extend Forwardable
 
     def_delegators :@search,
-                   :has_css?, :has_xpath?, :include?, :text, :truncated_text, :size, :length, :css, :xpath, :[]
+                   :has_css?, :has_xpath?, :include?,
+                   :siblings, :text, :truncated_text,
+                   :size, :length, :[],
+                   :css, :xpath
 
     def initialize(element, name, options: {}, siblings: [])
       @name = name

data/lib/rspec_html/matchers/match_text.rb

@@ -10,10 +10,28 @@ module RSpecHTML
 
       def match(actual)
         @rspec_actual = actual&.text
-        return (actual&.text || '').include?(@expected.to_s) unless @expected.is_a?(Regexp)
+        return regexp_match?(actual) || regexp_siblings_match?(actual) if @expected.is_a?(Regexp)
 
+        string_match?(actual) || string_siblings_match?(actual)
+      end
+
+      private
+
+      def regexp_match?(actual)
         @expected.match(actual&.text || '')
       end
+
+      def regexp_siblings_match?(actual)
+        actual.siblings.any? { |sibling| @expected.match(sibling&.text || '') }
+      end
+
+      def string_match?(actual)
+        (actual&.text || '').include?(@expected.to_s)
+      end
+
+      def string_siblings_match?(actual)
+        actual.siblings.any? { |sibling| (sibling&.text || '').include?(@expected.to_s) }
+      end
     end
   end
 end

data/lib/rspec_html/reconstituted_element.rb

@@ -12,6 +12,7 @@ module RSpecHTML
       name = @tag.to_s.downcase
       return '#document' if name == 'document'
       return name if name == 'document'
+      return "<#{name}#{@options} />" if @options.is_a?(String)
       return "<#{name}#{formatted_attributes} />" unless @options&.key?(:text)
 
       "<#{name}#{formatted_attributes}>#{@options[:text]}</#{name}>"

data/lib/rspec_html/search.rb

@@ -2,7 +2,10 @@
 
 module RSpecHTML
   # Provides element/attribute/text searching for HTML entities
+  # rubocop:disable Metrics/ClassLength
   class Search
+    attr_reader :siblings
+
     def initialize(element, siblings)
       @element = element
       @siblings = siblings
@@ -56,7 +59,7 @@ module RSpecHTML
     def size
       return @element.size if @element.respond_to?(:size)
 
-      @siblings.size
+      @siblings&.size || 0
     end
     alias length size
 
@@ -95,17 +98,23 @@ module RSpecHTML
     end
 
     def where(tag, query, all: false)
-      matched = if query[:class]
-                  where_class(tag, query[:class]) & where_xpath(tag, query.merge(class: nil))
-                else
-                  where_xpath(tag, query)
-                end
+      matched = matched_from_query(tag, query)
       return nil unless matched || all
       return matched&.first unless all
 
       matched
     end
 
+    def matched_from_query(tag, query)
+      if query.is_a?(String)
+        @element&.css("#{tag}#{query}")
+      elsif query[:class]
+        where_class(tag, query[:class]) & where_xpath(tag, query.merge(class: nil))
+      else
+        where_xpath(tag, query)
+      end
+    end
+
     def where_xpath(tag, query)
       conditions = "[#{where_conditions(query)}]" unless query.compact.empty?
       @element&.xpath("//#{tag}#{conditions}")
@@ -132,4 +141,5 @@ module RSpecHTML
       @element&.css(tag.to_s)
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.11
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2022-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri