webdrone 1.10.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54033552a41d39468377a85f94dab87190f0e390488835a37b13647503950189
-  data.tar.gz: 874c198bc2ae7167600be37ad096c744b82b5cd3fc88ad53a854020e1c8062d7
+  metadata.gz: 59b21203e4a9a61a584a1e062e7f26efe225a2212ac34bfef5ace8c4fe01d460
+  data.tar.gz: d12bbf98c32ab410d784c5c6a1af2d59ec2a8b7cad1fc12ac609d5d3b579252f
 SHA512:
-  metadata.gz: 529391d94128a9d0e7bd0ab5ff68de96e8991e8d4400e9e5446e74572fe651505ae57caa9e48ca880bea72ac0b020d212b39bfe368309476a9ed79526b1c5062
-  data.tar.gz: 40f4855afbfe706c0821936cd302364edd0d16fd24b65c227eea1a7f139614d08678b69ce7b8915af5a642259b1a476ff37cc5145b4f2a2ba4d73d017fa4a53b
+  metadata.gz: 3b3a88c1b42159fb7887ea3ff18e02a5637c17b3aab50d3121bfaa7a4a7602490c6fdf334d368531815b08cc5fef1d852c738e2edf9c6989b9ff3f07f95ebb8e
+  data.tar.gz: 10654e5945c31e7c31f45a74784147be0dcdbbfebbf169421fa9cc6755ccc973c01a3a4dae8a3a3fecfaad76f2f71cc927e519d6febfec68fd4ffdf2cf6595c9

data/.rubocop.yml

@@ -1,8 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 inherit_from:
 - .rubocop.relaxed.yml
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 Style/AccessModifierDeclarations:
   Enabled: false

data/CHANGELOG.md

@@ -4,6 +4,56 @@ New features are summarized here.
 
 
 
+## v.1.12.0 - 2019-12-04
+### Added
+- Added a new a0.conf.parent option, so instead of setting `parent:` in every method like:
+```ruby
+modal = a0.find.css '.modal-dialog'
+
+a0.form.set 'field', 'value', parent: modal
+a0.clic.on 'button', parent: modal
+```
+you can setup a default parent from now on with `a0.conf.parent=` like:
+```ruby
+a0.conf.parent = a0.find.css '.modal-dialog'
+
+a0.form.set 'field', 'value' # uses a0.conf.parent as default parent
+a0.clic.on 'button'
+
+a0.conf.parent = nil # resets default parent
+```
+- Added the following methods to `a0.ctxt`:
+  - `a0.ctxt.id`
+  - `a0.ctxt.css`
+  - `a0.ctxt.link`
+  - `a0.ctxt.button`
+  - `a0.ctxt.on`
+  - `a0.ctxt.option`
+  - `a0.ctxt.xpath`
+
+So instead of code like the above, we can use give a block of code to automatically switch in a stack of parents like:
+```ruby
+a0.ctxt.css '.modal-dialog' do
+  # sets a0.conf.parent = the found .modal-dialog
+  a0.form.set 'field', 'value'
+  a0.clic.on 'button'
+
+  a0.ctxt.css '.modal-footer' do
+    # sets a0.conf.parent to the found .modal-footer within the previous .modal-dialog
+  end
+  # sets a0.conf.parent back to the found .modal-dialog
+end
+# sets a0.conf.parent back to nil (the default) or whatever it was before calling a0.ctxt.css
+```
+
+
+
+## v.1.10.0
+### Fixed
+- Warnings for chrome and firefox
+
+
+
 ## v.1.8.12 - 2019-02-22
 ### Fixed
 - Fixing null terminal column size when used without a terminal, caused by highlight 2.0.1.

data/README.md

@@ -2,8 +2,6 @@
 
 Yet another selenium webdriver wrapper, ruby version.
 
-There is a groovy version available, at https://github.com/a0/a0-webdrone-groovy.
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/webdrone/clic.rb

@@ -14,7 +14,7 @@ module Webdrone
       @a0 = a0
     end
 
-    def clic(text, n: 1, all: false, visible: true, scroll: false, parent: nil, color: '#af1616', times: nil, delay: nil, shot: nil, mark: false)
+    def clic(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent, 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
       @a0.mark.mark_item(item, color: color, times: times, delay: delay, shot: shot, text: text) if mark
       @a0.shot.screen shot.is_a?(String) ? shot : text if shot

data/lib/webdrone/conf.rb

@@ -8,7 +8,7 @@ module Webdrone
   end
 
   class Conf
-    attr_accessor :developer, :logger
+    attr_accessor :developer, :logger, :parent
     attr_reader :a0, :timeout, :outdir, :error
 
     def initialize(a0)

data/lib/webdrone/ctxt.rb

@@ -13,6 +13,7 @@ module Webdrone
     def initialize(a0)
       @a0 = a0
       @framestack = []
+      @parent_stack = []
     end
 
     def create_tab
@@ -83,5 +84,38 @@ module Webdrone
         @a0.conf.send "#{k}=", v
       end
     end
+
+    def ctxt(text, n: 1, visible: true, scroll: false, parent: @a0.conf.parent, color: '#3db116', times: nil, delay: nil, shot: nil, mark: true)
+      item = @a0.find.send __callee__, text, n: n, all: false, visible: visible, scroll: scroll, parent: parent
+      @a0.mark.mark_item(item, color: color, times: times, delay: delay, shot: shot, text: text) if mark
+      @a0.shot.screen shot.is_a?(String) ? shot : text if shot
+
+      @parent_stack << @a0.conf.parent
+      @a0.conf.parent = item
+
+      if block_given?
+        begin
+          yield
+        ensure
+          parent_pop
+        end
+      end
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
+    end
+
+    def parent_pop
+      @a0.conf.parent = @parent_stack.pop
+    end
+
+    alias_method :id,     :ctxt
+    alias_method :css,    :ctxt
+    alias_method :link,   :ctxt
+    alias_method :button, :ctxt
+    alias_method :on,     :ctxt
+    alias_method :option, :ctxt
+    alias_method :xpath,  :ctxt
+
+    protected :ctxt
   end
 end

data/lib/webdrone/error.rb

@@ -65,7 +65,7 @@ module Webdrone
       ini = 0 if ini.negative?
 
       write_title "LOCATION OF ERROR"
-      write_line "#{@location[:path]} AT LINE #{sprintf '%3d', @location[:lineno]}"
+      write_line "#{@location[:path]} AT LINE #{sprintf '%<location>3d', location: @location[:lineno]}"
       File.readlines(@location[:path])[ini..fin].each_with_index do |line, index|
         lno = index + ini + 1
         if lno == @location[:lineno]

data/lib/webdrone/find.rb

@@ -14,7 +14,7 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+    def id(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent)
       @a0.wait.for do
         items = (parent || @a0.driver).find_elements :id, text
         choose(items, n, all, visible, scroll)
@@ -23,7 +23,7 @@ module Webdrone
       Webdrone.report_error(@a0, error)
     end
 
-    def css(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+    def css(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent)
       @a0.wait.for do
         items = (parent || @a0.driver).find_elements :css, text
         choose(items, n, all, visible, scroll)
@@ -32,31 +32,31 @@ module Webdrone
       Webdrone.report_error(@a0, error)
     end
 
-    def link(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+    def link(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent)
       xpath Webdrone::XPath.link(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
     rescue StandardError => error
       Webdrone.report_error(@a0, error)
     end
 
-    def button(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+    def button(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent)
       xpath Webdrone::XPath.button(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
     rescue StandardError => error
       Webdrone.report_error(@a0, error)
     end
 
-    def on(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+    def on(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent)
       xpath Webdrone::XPath.link_or_button(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
     rescue StandardError => error
       Webdrone.report_error(@a0, error)
     end
 
-    def option(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+    def option(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent)
       xpath Webdrone::XPath.option(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
     rescue StandardError => error
       Webdrone.report_error(@a0, error)
     end
 
-    def xpath(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+    def xpath(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent)
       @a0.wait.for do
         items = (parent || @a0.driver).find_elements :xpath, text
         choose(items, n, all, visible, scroll)

data/lib/webdrone/form.rb

@@ -90,7 +90,7 @@ module Webdrone
       @data = prev
     end
 
-    def set(key, val, n: 1, visible: true, scroll: false, parent: nil, mark: false)
+    def set(key, val, n: 1, visible: true, scroll: false, parent: a0.conf.parent, mark: false)
       item = find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
       @a0.mark.mark_item item if mark
       if item.tag_name == 'select'
@@ -114,7 +114,7 @@ module Webdrone
       Webdrone.report_error(@a0, error)
     end
 
-    def get(key, n: 1, visible: true, scroll: false, parent: nil, mark: false)
+    def get(key, n: 1, visible: true, scroll: false, parent: a0.conf.parent, mark: false)
       item = find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
       @a0.mark.mark_item item if mark
       item[:value]
@@ -122,7 +122,7 @@ module Webdrone
       Webdrone.report_error(@a0, error)
     end
 
-    def clic(key, n: 1, visible: true, scroll: false, parent: nil, mark: false)
+    def clic(key, n: 1, visible: true, scroll: false, parent: a0.conf.parent, mark: false)
       item = find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
       @a0.mark.mark_item item if mark
       item.click
@@ -130,7 +130,7 @@ module Webdrone
       Webdrone.report_error(@a0, error)
     end
 
-    def selected?(key, n: 1, visible: true, scroll: false, parent: nil, mark: false)
+    def selected?(key, n: 1, visible: true, scroll: false, parent: a0.conf.parent, mark: false)
       item = find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
       @a0.mark.mark_item item if mark
       item.selected?
@@ -138,13 +138,13 @@ module Webdrone
       Webdrone.report_error(@a0, error)
     end
 
-    def mark(key, n: 1, visible: true, scroll: false, parent: nil, color: '#af1616', times: nil, delay: nil, shot: nil)
+    def mark(key, n: 1, visible: true, scroll: false, parent: a0.conf.parent, color: '#af1616', times: nil, delay: nil, shot: nil)
       @a0.mark.mark_item find_item(key, n: n, visible: visible, scroll: scroll, parent: parent), color: color, times: times, delay: delay, shot: shot
     rescue StandardError => error
       Webdrone.report_error(@a0, error)
     end
 
-    def submit(key = nil, n: 1, visible: true, scroll: false, parent: nil, mark: false)
+    def submit(key = nil, n: 1, visible: true, scroll: false, parent: a0.conf.parent, mark: false)
       item = find_item(key, n: n, visible: visible, scroll: scroll, parent: parent) if key
       @a0.mark.mark_item item if mark
       @lastitem.submit
@@ -160,7 +160,7 @@ module Webdrone
       Webdrone.report_error(@a0, error)
     end
 
-    def find_item(key, n: 1, visible: true, scroll: false, parent: nil)
+    def find_item(key, n: 1, visible: true, scroll: false, parent: a0.conf.parent)
       @lastitem = \
         if @xpath.respond_to? :call
           @a0.find.xpath @xpath.call(key).to_s, n: n, visible: visible, scroll: scroll, parent: parent

data/lib/webdrone/html.rb

@@ -14,7 +14,7 @@ module Webdrone
       @a0 = a0
     end
 
-    def find_html(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
+    def find_html(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent)
       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' }

data/lib/webdrone/mark.rb

@@ -18,7 +18,7 @@ module Webdrone
       @clear = ENV['WEBDRONE_MARK_CLEAR'] == 'true' || false
     end
 
-    def mark(text, n: 1, all: false, visible: true, scroll: false, parent: nil, color: '#af1616', times: nil, delay: nil, shot: nil)
+    def mark(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent, 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 StandardError => error

data/lib/webdrone/text.rb

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

data/lib/webdrone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Webdrone
-  VERSION = '1.10.0'
+  VERSION = '1.12.0'
 end

data/lib/webdrone/vrfy.rb

@@ -14,7 +14,7 @@ module Webdrone
       @a0 = a0
     end
 
-    def vrfy(text, n: 1, all: false, visible: true, scroll: false, parent: nil, attr: nil, eq: nil, contains: nil, mark: false)
+    def vrfy(text, n: 1, all: false, visible: true, scroll: false, parent: a0.conf.parent, attr: nil, eq: nil, contains: nil, mark: false)
       item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, scroll: scroll, parent: parent
       @a0.mark.mark_item item if mark
       if item.is_a? Array

data/webdrone.gemspec

@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'solargraph'
 
   spec.add_runtime_dependency 'binding_of_caller'
   spec.add_runtime_dependency 'highline', '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: solargraph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement