testcentricity_web 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d450e7584fcada45507bcce94357d5c48f45ce
-  data.tar.gz: 62a0b88fb18e18d844feea66ce248f823653b18f
+  metadata.gz: d4edaaa4fcef2bdc3bbc2f414b813069f26ffcda
+  data.tar.gz: aa80ace49bf4cf496510969d29bf1742f7aa3ae1
 SHA512:
-  metadata.gz: d85d7810484d82aecfbe9b495f7351f06638e2403659c1edb69c1abfea809c60295ddd6343e93398654fcd58e2807ca934751cc13ed262401b30a346cd514ce7
-  data.tar.gz: 003943bb68ef0f2c79c2b4076ec64c51ddac31cf13ea64d7e08b48aed973666fddb5f7100758993a09241fdf14a4b30478ff20dc61baefde1b1a9a26758a8ad4
+  metadata.gz: 648db7efaf75de5d614f30486536567322a4491454ade71185bf39a070ef5ab85a77015f60729bde54e1954e67941a5b8299cdf7dffb6f55f85d384454b344ec
+  data.tar.gz: 53201ce9d75df3a32fa301963a0ab83049e9c096691c4bd2173f87a997170e23049ce273a846a05c92066e0921e359411e688a431277c68d1bd31b9ef1ab2886

data/lib/testcentricity_web/page_sections_helper.rb

@@ -338,31 +338,21 @@ module TestCentricity
     private
 
     def find_section
-      wait = Selenium::WebDriver::Wait.new(timeout: Capybara.default_max_wait_time)
-      wait.until { find_object }
-    end
-
-    def find_object
       locator = get_locator
-      saved_wait_time = Capybara.default_max_wait_time
-      Capybara.default_max_wait_time = 0.1
       tries ||= 2
       attributes = [:id, :xpath, :css]
       type = attributes[tries]
       case type
       when :css
-        locator = locator.gsub("|", " ")
+        locator = locator.gsub('|', ' ')
       when :xpath
-        locator = locator.gsub("|//", "//")
+        locator = locator.gsub('|', '')
       end
-      obj = page.find(type, locator)
+      obj = page.find(type, locator, :wait => 0.1)
       [obj, type]
     rescue
-      Capybara.default_max_wait_time = saved_wait_time
       retry if (tries -= 1) > 0
       [nil, nil]
-    ensure
-      Capybara.default_max_wait_time = saved_wait_time
     end
   end
 end

data/lib/testcentricity_web/ui_elements_helper.rb

@@ -290,26 +290,30 @@ module TestCentricity
 
     def find_object
       @alt_locator.nil? ? locator = @locator : locator = @alt_locator
-      locator = "#{@parent.get_locator}|#{locator}" if @context == :section && !@parent.get_locator.nil?
-      saved_wait_time = Capybara.default_max_wait_time
-      Capybara.default_max_wait_time = 0.01
-      tries ||= 2
-      attributes = [:id, :xpath, :css]
+      tries ||= 3
+      attributes = [:name, :id, :xpath, :css]
       type = attributes[tries]
-      case type
-      when :css
-        locator = locator.gsub("|", " ")
-      when :xpath
-        locator = locator.gsub("|//", "//")
+      if @context == :section && !@parent.get_locator.nil?
+        parent_locator = @parent.get_locator
+        case type
+        when :css
+          parent_locator = parent_locator.gsub('|', ' ')
+          obj = page.find(:css, parent_locator, :wait => 0.01).find(:css, locator, :wait => 0.01)
+        when :xpath
+          parent_locator = parent_locator.gsub('|', '')
+          obj = page.find(:xpath, "#{parent_locator}#{locator}", :wait => 0.01)
+          when :id
+            parent_locator = parent_locator.gsub('|', ' ')
+            obj = page.find(:css, parent_locator, :wait => 0.01).find(:xpath, locator, :wait => 0.01)
+        end
+      else
+        obj = page.find(type, locator, :wait => 0.01)
       end
-      obj = page.find(type, locator)
       [obj, type]
     rescue
-      Capybara.default_max_wait_time = saved_wait_time
       retry if (tries -= 1) > 0
       [nil, nil]
     ensure
-      Capybara.default_max_wait_time = saved_wait_time
       Capybara.ignore_hidden_elements = true
     end
 

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity_web
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - A.J. Mrozinski