webdrone 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fbf2834fda9d25612ca0f4b0956eed56ff7840f
-  data.tar.gz: 7de666b447164ff3e7b837d0e32d9378a806115b
+  metadata.gz: de07d3e1cc368936c87a52c2ab91499e7665bf0a
+  data.tar.gz: 60aef6556d1293c65debedeb7a04c6d69034939b
 SHA512:
-  metadata.gz: 10576653f0dec4145d19db447a26da31b96ffdd8251e5c365ff6c59ffb001f7da381b1d4f4811c48a063de404a80a1de7fdb7895daecfdb4be03562a6751ae08
-  data.tar.gz: 626212233751c8b29d215db9dc17cfba4a95b7d565b561ba30dfb62a8a938272509163007c8915dad68b03b12cdfca344c794d756b111a5f3ff12000e762c480
+  metadata.gz: 21f4408f762239675ed1ffc80b09697b1366fcee818a8f0cc5afa4eba566af3bc1a393184c3b97ae31c3dc413105888a3d945394ed4474ea95bb4daccad6d552
+  data.tar.gz: 46222e2425d4cb564ccd5d79dddcd69b8065e301119930e659a3731e86d8abc5ea9df4e91b707c25f1a013093c309cf8b459377a0d6d0018685c07ca571aa75d

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.1
+ruby-2.4.1

data/CHANGELOG.md

@@ -4,6 +4,28 @@ New features are summarized here.
 
 
 
+## v.1.7.0 - 2017-08-14
+### Added
+- Find children elements of a parent element. For ex, given the following HTML:
+```HTML
+<div id="objects">
+  <a>Create</a>
+</div>
+<div id="properties">
+  <a>Create</a>
+</div>
+```
+```ruby
+objs = a0.find.id 'objects'
+prps = a0.find.id 'properties'
+
+# click properties link
+a0.clic.on      'Create', parent: prps
+# click objects link
+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.
@@ -26,7 +48,7 @@ a0 = Webdrone.create timeout: 10    # setting timeout to 10 seconds
 
 # Now
 a0 = Webdrone.create                # default timeout of 30 seconds
-a0 = Webdrone.create timeout: 10    # overriding timeout to 10 seconds 
+a0 = Webdrone.create timeout: 10    # overriding timeout to 10 seconds
 ```
 - Renamed `sleep` to `delay` in `a0.mark`, for example:
 ```ruby
@@ -47,7 +69,7 @@ a0.mark.on          'something', times: 2, delay: 1
 ### Fixed
 - Firefox using geckodriver is not supporting window resizing/positioning :-(. The following error will be ignored in the meantime:
 ```
-Selenium::WebDriver::Error::UnsupportedOperationError: The W3C standard does not currently support setting the Window Position" 
+Selenium::WebDriver::Error::UnsupportedOperationError: The W3C standard does not currently support setting the Window Position"
 ```
 
 
@@ -292,5 +314,3 @@ ruby test-script-01.rb
 - Developer mode: a console appears when an error occurs. The console has the context of your script, so you can debug them easily.
 - New option `Webdrone.create` `developer: true` to enable developer mode described above (by default is `false`).
 - Added optional parameters `n:`, `visible:` to all commands in `a0.form`: `set`, `get`, `clic`, `mark` and `submit`.
-
-

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)
-      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+    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
       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,51 +12,51 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text, n: 1, all: false, visible: true)
+    def id(text, n: 1, all: false, visible: true, parent: nil)
       @a0.wait.for do
-        items = @a0.driver.find_elements :id, text
+        items = (parent || @a0.driver).find_elements :id, text
         choose(items, n, all, visible)
       end
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def css(text, n: 1, all: false, visible: true)
+    def css(text, n: 1, all: false, visible: true, parent: nil)
       @a0.wait.for do
-        items = @a0.driver.find_elements :css, text
+        items = (parent || @a0.driver).find_elements :css, text
         choose(items, n, all, visible)
       end
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def link(text, n: 1, all: false, visible: true)
-      self.xpath XPath::HTML.link(text).to_s, n: n, all: all, visible: visible
+    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
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def button(text, n: 1, all: false, visible: true)
-      self.xpath XPath::HTML.button(text).to_s, n: n, all: all, visible: visible
+    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
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def on(text, n: 1, all: false, visible: true)
-      self.xpath XPath::HTML.link_or_button(text).to_s, n: n, all: all, visible: visible
+    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
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def option(text, n: 1, all: false, visible: true)
-      self.xpath XPath::HTML.option(text).to_s, n: n, all: all, visible: visible
+    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
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def xpath(text, n: 1, all: false, visible: true)
+    def xpath(text, n: 1, all: false, visible: true, parent: nil)
       @a0.wait.for do
-        items = @a0.driver.find_elements :xpath, text
+        items = (parent || @a0.driver).find_elements :xpath, text
         choose(items, n, all, visible)
       end
     rescue => exception

data/lib/webdrone/form.rb

@@ -65,7 +65,7 @@ module Webdrone
         x = heads.shift
         x ||= name
         worksheet.add_cell 0, 0, x
-        
+
         heads += data.keys.sort
         heads = heads.uniq
 
@@ -87,8 +87,8 @@ module Webdrone
       @data = prev
     end
 
-    def set(key, val, n: 1, visible: true)
-      item = self.find_item(key, n: n, visible: visible)
+    def set(key, val, n: 1, visible: true, parent: nil)
+      item = self.find_item(key, n: n, visible: visible, parent: parent)
       if item.tag_name == 'select'
         option = item.find_element :xpath, XPath::HTML.option(val).to_s
         option.click
@@ -102,26 +102,26 @@ module Webdrone
       Webdrone.report_error(@a0, exception)
     end
 
-    def get(key, n: 1, visible: true)
-      self.find_item(key, n: n, visible: visible)[:value]
+    def get(key, n: 1, visible: true, parent: nil)
+      self.find_item(key, n: n, visible: visible, parent: parent)[:value]
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def clic(key, n: 1, visible: true)
-      self.find_item(key, n: n, visible: visible).click
+    def clic(key, n: 1, visible: true, parent: nil)
+      self.find_item(key, n: n, visible: visible, parent: parent).click
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def mark(key, n: 1, visible: true, color: '#af1616', times: nil, delay: nil, shot: nil)
-      @a0.mark.mark_item self.find_item(key, n: n, visible: visible), color: color, times: times, delay: delay, shot: shot
+    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
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
 
-    def submit(key = nil, n: 1, visible: true)
-      self.find_item(key, n: n, visible: visible) if key
+    def submit(key = nil, n: 1, visible: true, parent: nil)
+      self.find_item(key, n: n, visible: visible, parent: parent) if key
       @lastitem.submit
     rescue => exception
       Webdrone.report_error(@a0, exception)
@@ -136,13 +136,13 @@ module Webdrone
     end
 
     protected
-      def find_item(key, n: 1, visible: true)
+      def find_item(key, n: 1, visible: true, parent: nil)
         if @xpath.respond_to? :call
-          @lastitem = @a0.find.xpath @xpath.call(key).to_s, n: n, visible: visible
+          @lastitem = @a0.find.xpath @xpath.call(key).to_s, n: n, visible: visible, parent: parent
         elsif @xpath.is_a? String and @xpath.include? '%s'
-          @lastitem = @a0.find.xpath sprintf(@xpath, key), n: n, visible: visible
+          @lastitem = @a0.find.xpath sprintf(@xpath, key), n: n, visible: visible, parent: parent
         else
-          @lastitem = @a0.find.xpath XPath::HTML.field(key).to_s, n: n, visible: visible
+          @lastitem = @a0.find.xpath XPath::HTML.field(key).to_s, n: n, visible: visible, 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)
-      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+    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
       if item.is_a? Array
         item.collect { |x| x.attribute 'innerHTML'}
       else

data/lib/webdrone/mark.rb

@@ -14,8 +14,8 @@ module Webdrone
       @default_delay = ENV['WEBDRONE_MARK_DELAY'] || 0.05
     end
 
-    def mark(text, n: 1, all: false, visible: true, color: '#af1616', times: nil, delay: nil, shot: nil)
-      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+    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
       mark_item item, color: color, times: times, delay: delay, shot: shot, text: text
     rescue => exception
       Webdrone.report_error(@a0, exception)

data/lib/webdrone/text.rb

@@ -12,8 +12,8 @@ module Webdrone
       @a0 = a0
     end
 
-    def text(text, n: 1, all: false, visible: true)
-      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+    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
       if item.is_a? Array
         item.collect(&:text)
       else
@@ -30,7 +30,7 @@ module Webdrone
     alias_method :on,     :text
     alias_method :option, :text
     alias_method :xpath,  :text
-    
+
     def page_title
       @a0.driver.title
     rescue => exception

data/lib/webdrone/version.rb

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

data/lib/webdrone/vrfy.rb

@@ -12,8 +12,8 @@ module Webdrone
       @a0 = a0
     end
 
-    def vrfy(text, n: 1, all: false, visible: true, attr: nil, eq: nil, contains: nil)
-      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+    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
       if item.is_a? Array
         item.each { |x| vrfy_item x, text: text, callee: __callee__, attr: attr, eq: eq, contains: contains }
       else

data/webdrone.gemspec

@@ -27,13 +27,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "rake", "~> 10.5"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "ci_reporter_rspec"
   spec.add_development_dependency "parallel_tests"
   spec.add_runtime_dependency "os"
-  spec.add_runtime_dependency "selenium-webdriver"
+  spec.add_runtime_dependency "selenium-webdriver", ">= 3.5.0"
   spec.add_runtime_dependency "xpath"
   spec.add_runtime_dependency "rubyXL"
   spec.add_runtime_dependency "binding_of_caller"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: xpath
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A simple selenium webdriver wrapper, ruby version.