watigiri 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acd708121fc8cb20c263c683acf3b021c396fc16
-  data.tar.gz: ed2524285816a2add8b394598141115556ed7dc8
+  metadata.gz: 2fd0e4b0bff75232878fbfa396d89e6d8c6bafbc
+  data.tar.gz: 06ee3c3acf02723a8de7aca0b02e8f84422b56f5
 SHA512:
-  metadata.gz: 42ca74e87402d2a77a9777795814f0e95cb731f8ee1bbad710b8d35703e590d9f2dee3b1e9c04b1ad06234821a0882cc96c699dde6587cb3bc383093e4847419
-  data.tar.gz: 5a01f63348806558b179d4f2285ba2eddc3ed9298f3063d1b8790c9156bda4f9d5a427038488bbb1d2635a236f6da89492ca367aafaf2302c494462cbe111616
+  metadata.gz: 8f919b5c53a445536ef18177c5609bce92995072a32048268c82763f262aa25916184e4c9fc07ce1a5d800001cd5b4090a2347f4fabd4208915e266c5df821c1
+  data.tar.gz: 5dd9eb0bf66df384af9ff4430bc26e0e32e87b2ca07c372ad969b2d831fab0b2b92e7f071482dfe98a6113ed1d62bed1bb5c0b0fdddaba5a5d56e65400e3ceea

data/lib/watigiri/locators/element/locator.rb

@@ -8,7 +8,7 @@ module Watigiri
     end
 
     def tag_name
-      element.name
+      element.name.downcase
     end
   end
 
@@ -19,8 +19,13 @@ module Watigiri
         @regex = regex?
 
         return super unless @nokogiri || @regex
-        command = @query_scope.is_a?(Watir::Browser) ? :html : :inner_html
-        @query_scope.doc ||= Nokogiri::HTML(@query_scope.send(command)).tap { |d| d.css('script').remove }
+        @query_scope.doc ||= if @query_scope.is_a?(Watir::Browser)
+                               Nokogiri::HTML(@query_scope.html).tap { |d| d.css('script').remove }
+                             else
+                               # This should be using `#fragment`, but can't because of
+                               # https://github.com/sparklemotion/nokogiri/issues/572
+                               Nokogiri::HTML(@query_scope.inner_html)
+                             end
 
         element = using_watir(:first)
         return if element.nil?
@@ -63,11 +68,12 @@ module Watigiri
       def nokogiri_to_selenium(element)
         return element if element.is_a?(Selenium::WebDriver::Element)
         tag = element.tag_name
-        index = @query_scope.doc.xpath("//#{tag}").find_index { |el| el == element.element }
+        index = @query_scope.doc.xpath(".//#{tag}").find_index { |el| el == element.element }
         Watir::Element.new(@query_scope, index: index, tag_name: tag).wd
       end
 
       def regex?
+        return false unless (@selector.keys & %i[adjacent visible label text visible_text]).empty?
         @selector.values.any? { |v| v.is_a?(Regexp) }
       end
     end
@@ -88,12 +94,22 @@ module Watigiri
     class Cell
       class Locator < Watir::Locators::Cell::Locator
         include LocatorHelpers
+
+        # Don't use for rows
+        def regex?
+          false
+        end
       end
     end
 
     class Row
       class Locator < Watir::Locators::Row::Locator
         include LocatorHelpers
+
+        # Don't use for rows
+        def regex?
+          false
+        end
       end
     end
 
@@ -102,6 +118,7 @@ module Watigiri
         include LocatorHelpers
 
         def regex?
+          return false unless (@selector.keys & %i[adjacent visible label text visible_text]).empty?
           @selector.any? { |k, v| v.is_a?(Regexp) && k != :value }
         end
       end
@@ -115,7 +132,7 @@ module Watigiri
           return super if element.is_a? Selenium::WebDriver::Element
           rx_selector = rx_selector.dup
 
-          tag_name = element.name.downcase
+          tag_name = element.tag_name
 
           [:text, :value, :label].each do |key|
             if rx_selector.key?(key)
@@ -130,6 +147,7 @@ module Watigiri
         end
 
         def regex?
+          return false unless (@selector.keys & %i[adjacent visible label text visible_text]).empty?
           @selector.any? { |k, v| v.is_a?(Regexp) && k != :value }
         end
       end

data/watigiri.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "watigiri"
-  spec.version       = "0.3.2"
+  spec.version       = "0.4.0"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watigiri
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler