webdrone 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de07d3e1cc368936c87a52c2ab91499e7665bf0a
-  data.tar.gz: 60aef6556d1293c65debedeb7a04c6d69034939b
+  metadata.gz: 141718e84c9548a1dc99d014b84c7a0cb93daa4f
+  data.tar.gz: e84dc032f5d2c518ff41a0a3c0418e4ab4701a81
 SHA512:
-  metadata.gz: 21f4408f762239675ed1ffc80b09697b1366fcee818a8f0cc5afa4eba566af3bc1a393184c3b97ae31c3dc413105888a3d945394ed4474ea95bb4daccad6d552
-  data.tar.gz: 46222e2425d4cb564ccd5d79dddcd69b8065e301119930e659a3731e86d8abc5ea9df4e91b707c25f1a013093c309cf8b459377a0d6d0018685c07ca571aa75d
+  metadata.gz: 0e0e96ce97f449aa4b9f63b1e2e07e667e0e5afab367da12ec984c1c07823363737f6d8e2751ab0280e319eaf2796db5cc1954b5b32072a14097252bfd5a50c5
+  data.tar.gz: 3e53743cb6cca9afaf4abe34252d92f9206cdabee284c4d696025b9ee54bfc84cc0b721d7ef648e00f24bc04470bec92000f8859204643e88de76ed1dc2c84ea

data/CHANGELOG.md

@@ -4,7 +4,14 @@ New features are summarized here.
 
 
 
-## v.1.7.0 - 2017-08-14
+## v.1.7.2 - 2017-08-13
+### Added
+- New option to clear the mark outline. Enable with `a0.mark.clear = true` or setting the environment variable `WEBDRONE_MARK_CLEAR` to `true`
+- Initial support to scroll element with `scroll: true`. Scrolling is supported in the following verbs: `a0.clic.*`, `a0.find.*`, `a0.form.*`, `a0.html.*`, `a0.mark.*`, `a0.text.*` and `a0.vrfy.*` (Closes: #5)
+
+
+
+## v.1.7.0 - 2017-08-13
 ### Added
 - Find children elements of a parent element. For ex, given the following HTML:
 ```HTML
@@ -26,6 +33,8 @@ a0.clic.on      'Create', parent: objs
 ```
 - parent is supported in the following verbs: `a0.clic.*`, `a0.find.*`, `a0.form.*`, `a0.html.*`, `a0.mark.*`, `a0.text.*` and `a0.vrfy.*`
 
+
+
 ## v.1.6.2 - 2017-04-11
 ### Changed
 - Changed default preferences for chrome, disabling the password save dialog.

data/lib/webdrone/clic.rb

@@ -12,8 +12,8 @@ module Webdrone
       @a0 = a0
     end
 
-    def clic(text, n: 1, all: false, visible: true, color: '#af1616', times: nil, delay: nil, shot: nil, mark: false, parent: nil)
-      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, parent: parent
+    def clic(text, n: 1, all: false, visible: true, scroll: false, parent: nil, color: '#af1616', times: nil, delay: nil, shot: nil, mark: false)
+      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, scroll: scroll, parent: parent
       if mark
         @a0.mark.mark_item(item, color: color, times: times, delay: delay, shot: shot, text: text)
       elsif shot

data/lib/webdrone/find.rb

@@ -12,59 +12,59 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text, n: 1, all: false, visible: true, parent: nil)
+    def id(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
       @a0.wait.for do
         items = (parent || @a0.driver).find_elements :id, text
-        choose(items, n, all, visible)
+        choose(items, n, all, visible, scroll)
       end
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def css(text, n: 1, all: false, visible: true, parent: nil)
+    def css(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
       @a0.wait.for do
         items = (parent || @a0.driver).find_elements :css, text
-        choose(items, n, all, visible)
+        choose(items, n, all, visible, scroll)
       end
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def link(text, n: 1, all: false, visible: true, parent: nil)
-      self.xpath XPath::HTML.link(text).to_s, n: n, all: all, visible: visible, parent: parent
+    def link(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+      self.xpath XPath::HTML.link(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def button(text, n: 1, all: false, visible: true, parent: nil)
-      self.xpath XPath::HTML.button(text).to_s, n: n, all: all, visible: visible, parent: parent
+    def button(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+      self.xpath XPath::HTML.button(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def on(text, n: 1, all: false, visible: true, parent: nil)
-      self.xpath XPath::HTML.link_or_button(text).to_s, n: n, all: all, visible: visible, parent: parent
+    def on(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+      self.xpath XPath::HTML.link_or_button(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def option(text, n: 1, all: false, visible: true, parent: nil)
-      self.xpath XPath::HTML.option(text).to_s, n: n, all: all, visible: visible, parent: parent
+    def option(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+      self.xpath XPath::HTML.option(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def xpath(text, n: 1, all: false, visible: true, parent: nil)
+    def xpath(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
       @a0.wait.for do
         items = (parent || @a0.driver).find_elements :xpath, text
-        choose(items, n, all, visible)
+        choose(items, n, all, visible, scroll)
       end
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
     protected
-      def choose(list, n, all, visible)
+      def choose(list, n, all, visible, scroll)
         list = list.select do |x|
           if visible == true
             x.displayed?
@@ -74,6 +74,11 @@ module Webdrone
             true
           end
         end
+
+        if scroll and list.length > 0
+          @a0.exec.script 'arguments[0].scrollIntoView()', list.first
+        end
+
         if all
           list
         else

data/lib/webdrone/form.rb

@@ -87,8 +87,9 @@ module Webdrone
       @data = prev
     end
 
-    def set(key, val, n: 1, visible: true, parent: nil)
-      item = self.find_item(key, n: n, visible: visible, parent: parent)
+    def set(key, val, n: 1, visible: true, scroll: false, parent: nil, mark: false)
+      item = self.find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
+      @a0.mark.mark_item item if mark
       if item.tag_name == 'select'
         option = item.find_element :xpath, XPath::HTML.option(val).to_s
         option.click
@@ -102,26 +103,30 @@ module Webdrone
       Webdrone.report_error(@a0, exception)
     end
 
-    def get(key, n: 1, visible: true, parent: nil)
-      self.find_item(key, n: n, visible: visible, parent: parent)[:value]
+    def get(key, n: 1, visible: true, scroll: false, parent: nil, mark: false)
+      item = self.find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
+      @a0.mark.mark_item item if mark
+      item[:value]
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def clic(key, n: 1, visible: true, parent: nil)
-      self.find_item(key, n: n, visible: visible, parent: parent).click
+    def clic(key, n: 1, visible: true, scroll: false, parent: nil, mark: false)
+      item = self.find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
+      @a0.mark.mark_item item if mark
+      item.click
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def mark(key, n: 1, visible: true, parent: nil, color: '#af1616', times: nil, delay: nil, shot: nil)
-      @a0.mark.mark_item self.find_item(key, n: n, visible: visible, parent: parent), color: color, times: times, delay: delay, shot: shot
+    def mark(key, n: 1, visible: true, scroll: false, parent: nil, color: '#af1616', times: nil, delay: nil, shot: nil)
+      @a0.mark.mark_item self.find_item(key, n: n, visible: visible, scroll: scroll, parent: parent), color: color, times: times, delay: delay, shot: shot
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def submit(key = nil, n: 1, visible: true, parent: nil)
-      self.find_item(key, n: n, visible: visible, parent: parent) if key
+    def submit(key = nil, n: 1, visible: true, scroll: false, parent: nil, mark: false)
+      self.find_item(key, n: n, visible: visible, scroll: scroll, parent: parent) if key
       @lastitem.submit
     rescue => exception
       Webdrone.report_error(@a0, exception)
@@ -136,13 +141,13 @@ module Webdrone
     end
 
     protected
-      def find_item(key, n: 1, visible: true, parent: nil)
+      def find_item(key, n: 1, visible: true, scroll: false, parent: nil)
         if @xpath.respond_to? :call
-          @lastitem = @a0.find.xpath @xpath.call(key).to_s, n: n, visible: visible, parent: parent
+          @lastitem = @a0.find.xpath @xpath.call(key).to_s, n: n, visible: visible, scroll: scroll, parent: parent
         elsif @xpath.is_a? String and @xpath.include? '%s'
-          @lastitem = @a0.find.xpath sprintf(@xpath, key), n: n, visible: visible, parent: parent
+          @lastitem = @a0.find.xpath sprintf(@xpath, key), n: n, visible: visible, scroll: scroll, parent: parent
         else
-          @lastitem = @a0.find.xpath XPath::HTML.field(key).to_s, n: n, visible: visible, parent: parent
+          @lastitem = @a0.find.xpath XPath::HTML.field(key).to_s, n: n, visible: visible, scroll: scroll, parent: parent
         end
       end
   end

data/lib/webdrone/html.rb

@@ -12,8 +12,8 @@ module Webdrone
       @a0 = a0
     end
 
-    def find_html(text, n: 1, all: false, visible: true, parent: nil)
-      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, parent: parent
+    def find_html(text, n: 1, all: false, visible: true, scroll: scroll, parent: nil)
+      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, scroll: scroll, parent: parent
       if item.is_a? Array
         item.collect { |x| x.attribute 'innerHTML'}
       else

data/lib/webdrone/mark.rb

@@ -6,16 +6,17 @@ module Webdrone
   end
 
   class Mark
-    attr_accessor :a0, :default_times, :default_delay
+    attr_accessor :a0, :default_times, :default_delay, :clear
 
     def initialize(a0)
       @a0 = a0
       @default_times = ENV['WEBDRONE_MARK_TIMES'] || 3
       @default_delay = ENV['WEBDRONE_MARK_DELAY'] || 0.05
+      @clear = ENV['WEBDRONE_MARK_CLEAR'] == 'true' || false
     end
 
-    def mark(text, n: 1, all: false, visible: true, parent: nil, color: '#af1616', times: nil, delay: nil, shot: nil)
-      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, parent: parent
+    def mark(text, n: 1, all: false, visible: true, scroll: false, parent: nil, color: '#af1616', times: nil, delay: nil, shot: nil)
+      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, scroll: scroll, parent: parent
       mark_item item, color: color, times: times, delay: delay, shot: shot, text: text
     rescue => exception
       Webdrone.report_error(@a0, exception)
@@ -41,16 +42,23 @@ module Webdrone
         sleep delay
       end
       @a0.shot.screen shot.is_a?(String) ? shot : text  if shot
+      mark_clear item if @clear
       item
     end
 
+    def mark_clear(item)
+      mark_item_border item, nil
+    end
+
     def mark_item_border(item, color)
+      style = color ? "'2px solid #{color}'" : "null"
+      set_outline = "arguments[0].style.outline = #{style}"
       if item.is_a? Array
         item.each do |item|
-          @a0.exec.script("arguments[0].style.outline = '2px solid #{color}'", item)
+          @a0.exec.script(set_outline, item)
         end
       else
-        @a0.exec.script("arguments[0].style.outline = '2px solid #{color}'", item)
+        @a0.exec.script(set_outline, item)
       end
     end
 

data/lib/webdrone/text.rb

@@ -12,8 +12,8 @@ module Webdrone
       @a0 = a0
     end
 
-    def text(text, n: 1, all: false, visible: true, parent: nil)
-      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, parent: parent
+    def text(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, scroll: scroll, parent: parent
       if item.is_a? Array
         item.collect(&:text)
       else

data/lib/webdrone/version.rb

@@ -1,3 +1,3 @@
 module Webdrone
-  VERSION = "1.7.0"
+  VERSION = "1.7.2"
 end

data/lib/webdrone/vrfy.rb

@@ -12,11 +12,13 @@ module Webdrone
       @a0 = a0
     end
 
-    def vrfy(text, n: 1, all: false, visible: true, parent: nil, attr: nil, eq: nil, contains: nil)
-      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, parent: parent
+    def vrfy(text, n: 1, all: false, visible: true, scroll: false, parent: nil, attr: nil, eq: nil, contains: nil, mark: false)
+      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, scroll: scroll, parent: parent
       if item.is_a? Array
-        item.each { |x| vrfy_item x, text: text, callee: __callee__, attr: attr, eq: eq, contains: contains }
+        @a0.mark.mark_item item if mark
+        item.each { |x| vrfy_item x, text: text, callee: __callee__, attr: attr, eq: eq, contains: contains, mark: mark }
       else
+        @a0.mark.mark_item item if mark
         vrfy_item item, text: text, callee: __callee__, attr: attr, eq: eq, contains: contains
       end
     rescue => exception

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler