findElement 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22629b919f842a7d9a34fb15ed7d6d0aad8373d676faaf426fe41f4d58d9de1
-  data.tar.gz: bbfc3afa068f426811959951ea7ca39fbfd284b48c50bacb6becd8b1fc8d3855
+  metadata.gz: e570a279ecfafeb56eaa78cae09371ef3417ad593a772c4f2d27377914f39d0e
+  data.tar.gz: a4180466cfc6eba0ed1e20816b37428d746c5412e8b24ae8a5c919c3edf44359
 SHA512:
-  metadata.gz: b30f1fb768b96c0a843c50e5c3345ebde12a8ea8684fb689fe76f7b1aa56b2988b6e427e002a52e798719feceb3dd6e20ff6ed07d220ef7ec1a0a14711c3cb3d
-  data.tar.gz: 7c88a102566120ce06e9a9ac9a1b4b55bece94904254baad9e2c364034cda03effefc3aa5442e5da905d18a3be51d82c11f3071e1e8a180f6de3be1a75dbaf52
+  metadata.gz: 3476867dabc3e10df473ec4740b4bd4f9780c946c20f6b580d49f244c0bbe0a1c5acd542927a449ceb31b5e78875f4802cd2b1d97d2859ea01956f0d0c13373a
+  data.tar.gz: 7b46fb5920d21b223ff3e76e5450da5f3e3a6a7d79c6a05b459050d63750e93672af237834c8519f37d33bf0fe1b41b9508d4a59655ab6bcb07022739da220a4

data/lib/findElement.rb

@@ -28,30 +28,36 @@ findElement("adv-spinner loadingSpinner").text ==> picture
 
 def findElement text
 
-  soruce = page.html
-  cond = soruce.split(text)
-  if cond.count == 2
-    tag = cond[0].split("<").last
-    tag = tag.split[0]
-
-    if cond[0][cond[0].length - 1] == '"'
-      attr = cond[0].split('<').last
-      attr = attr.split('="').last
-      attr = attr.split.last
-      return find(:xpath, "//#{tag}[@#{attr}='#{text}']", visible: true)
-    else
-      attr = cond[0].split("<").last
-      unless attr.include? "=\""
-        return find(:xpath, "//#{tag}[contains(text(),'#{text}')]", visible: true)
+
+  begin
+    Timeout.timeout(2) do
+      return find(:xpath, "//*[contains(text(),'#{text}')]", visible: true)
+    end
+  rescue
+    soruce = page.html
+    cond = soruce.split(text)
+    if cond.count == 2
+      tag = cond[0].split("<").last
+      tag = tag.split[0]
+
+      if cond[0][cond[0].length - 1] == '"'
+        attr = cond[0].split('<').last
+        attr = attr.split('="').last
+        attr = attr.split.last
+        return find(:xpath, "//#{tag}[@#{attr}='#{text}']", visible: true)
       else
-        key = attr.split('="')[0].split[1]
-        value = attr.split(key)[1].split('"')[1]
-        return find(:xpath, "//#{tag}[@#{key}='#{value}'][contains(text(),'#{text}')]", visible: true)
+        attr = cond[0].split("<").last
+        unless attr.include? "=\""
+          return find(:xpath, "//#{tag}[contains(text(),'#{text}')]", visible: true)
+        else
+          key = attr.split('="')[0].split[1]
+          value = attr.split(key)[1].split('"')[1]
+          return find(:xpath, "//#{tag}[@#{key}='#{value}'][contains(text(),'#{text}')]", visible: true)
+        end
       end
-    end
-  else
-    begin
-      attr_name = ['name', 'id', 'class', 'href', 'data-title', 'data-dismiss', 'style', 'title', 'type', 'placeholder', 'value', 'list', 'dropzone', 'draggable', 'download', 'form', 'headers']
+    else
+
+      attr_name = ['data-guid','data-id','id', 'name', 'class', 'href', 'data-title','text-area','text', 'data-dismiss', 'style', 'title', 'type', 'placeholder', 'value', 'list', 'dropzone', 'draggable', 'download', 'form', 'headers']
       i = 0
       attr_name.each do |attribute|
         @element = attribute + '="' + text + '"'
@@ -61,8 +67,6 @@ def findElement text
         raise('could not find :' + @element)
       end
       return find(:xpath, "//*[@#{@element}]", visible: true)
-    rescue
-      return find(:xpath, "//*[contains(text(),'#{text}')]", visible: true)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: findElement
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - bünyamin orhan