findElement 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28a493f5b47298958d793bd581ea1eab5f5d89fe8cdff6c5623f71147dd4e9fc
-  data.tar.gz: 69f656ccf0e2ccb128e69464eb9ee0c58b777bac6ca170e9908fd3f3884c849a
+  metadata.gz: 0f9ef2944e06d806563bb23f039029a4a4876a9f07e67494b68eb8accb02a94a
+  data.tar.gz: 709d4e19f9a52e862e19fc56f73fd6b39949c995aea586e46333f571b623fe15
 SHA512:
-  metadata.gz: acfef7762601a619e9d081ccda6a6c0e28583a649a949b735887710588f7c3ad77ae0ae7e6f8bc3faed9ce93947ee5dee260723486ab5b39fc9a275517084a29
-  data.tar.gz: 49030665b4fce8c8f365541fe7c6c3e278ec88013320e01781a20fd7269470a285e44388abf1d2d10e80c71102f56c6ddf652f8e7f752374a31158b4b93ef8b0
+  metadata.gz: 75d55650f9dfe7e38668de2b703859d7b7f074dc50f2dbd7140c2795af7187174fbc21e3cb15b700a0d1dc572a0e0519a61eb3ec7bc42219f56867f749d88fb7
+  data.tar.gz: 82ca022388e31d365c0c3a3a305663d198f5a2fb038ae52f3b0e2e4abc8d6e315fe63b6210c497574f9ff152ac34d0f59fb9b2e1c7d7a05fd3c5c7e0f6c7edad

data/lib/findElement.rb

@@ -28,48 +28,53 @@ findElement("adv-spinner loadingSpinner").text ==> picture
 
 def findElement text
 
+  if text.include? '@xpath'
 
-  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].delete(">")
-
-      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)
+    return find(:xpath, text.split('@xpath')[0])
+
+  else
+
+    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].delete(">")
+
+        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
+      else
+
+        attr_name = ['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 + '"'
+          break if soruce.include? @element
+          i += 1
+          next if i < attr_name.count
+          raise('could not find :' + @element)
+        end
+        return find(:xpath, "//*[@#{@element}]", visible: true)
       end
-    else
-
-      attr_name = ['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 + '"'
-        break if soruce.include? @element
-        i += 1
-        next if i < attr_name.count
-        raise('could not find :' + @element)
-      end
-      return find(:xpath, "//*[@#{@element}]", visible: true)
+
     end
 
   end
-
-
 end

metadata

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