webdrone 1.8.10 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95fc3004ce907de8f3a99fd537c19a34a82452927ef34c8118c7fd92f2821b37
-  data.tar.gz: 5f24f79bee0bfa8156e3ee71b3d305f217920ad610c2691b81a2a009b0741e68
+  metadata.gz: da42804712c004488731672632dedf04620ad225b5a758cfe8ffed48732d3c89
+  data.tar.gz: ee670b6d098ec87a933bac60216ee7fbd73757a7a34ef83e722ff519b16ab9c4
 SHA512:
-  metadata.gz: c469a518de176024ea16011482da223e7cda8c6a79865aea74821f9078ba1c107a0828fddaaaee339d2ade6013c9d47057d14a21cc03f67aaadf8d128d522bf3
-  data.tar.gz: d7f6272527b5ca91c99ee1fa3031509277ae11df5304e62c50f19d284d084f91799f9e456e8cbf9b2e45796984421730fac8a8bc55c3011c39073a0def6b4dc9
+  metadata.gz: f949b6c209e48c654c95a4d40d95fe688b3548d6379c54b5fb5d105a3ccec704953bd656656c17067b9ede38bde48fb468867b63d578ab65acc6390fe1984829
+  data.tar.gz: ed9dd7147e65d917049c72b583b07ddf13ebcff6edb7ff70f22a4ad7a7b64b637c85978f9992e15246d3af54e6fdfd02772e44133a897a110803feee6ef54490

data/.rubocop.relaxed.yml

@@ -1,5 +1,5 @@
 # Relaxed.Ruby.Style
-## Version 2.2
+## Version 2.4
 
 Style/Alias:
   Enabled: false
@@ -65,6 +65,10 @@ Style/NegatedWhile:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#stylenegatedwhile
 
+Style/NumericPredicate:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylenumericpredicate
+
 Style/ParallelAssignment:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#styleparallelassignment
@@ -121,6 +125,10 @@ Style/TrailingCommaInHashLiteral:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#styletrailingcommainhashliteral
 
+Style/SymbolArray:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesymbolarray
+
 Style/WhileUntilModifier:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#stylewhileuntilmodifier

data/.rubocop.yml

@@ -1,8 +1,18 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 inherit_from:
 - .rubocop.relaxed.yml
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 Style/AccessModifierDeclarations:
   Enabled: false
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+Metrics/BlockLength:
+  Max: 50
+Style/Attr:
+  Exclude:
+    - lib/webdrone/xpath.rb
+Lint/DuplicateMethods:
+  Exclude:
+    - lib/webdrone/xpath.rb

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.3
+ruby-2.6.4

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.2

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 rvm:
-  - 2.2.1
-before_install: gem install bundler -v 1.10.6
+  - 2.7.2
+before_install: gem install bundler -v 2.1.4

data/CHANGELOG.md

@@ -4,6 +4,78 @@ New features are summarized here.
 
 
 
+## v.1.16.0 - 2021-03-19
+### Changed
+- Webdrone will not start a developer console when an exception is raised an a0.conf.error is set to :raise, only when it is set to :raise_report
+
+
+
+## v.1.14.0 - 2021-03-19
+### Changed
+- New option for logger: :quiet that supress the normal stdout log, but not the log sent to webdrone_output dir.
+```ruby
+a0 = Webdrone.create logger: :quiet
+```
+
+
+
+## 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.
+- Fixing maximizing start for chrome.
+
+
+
 ## v.1.8.10 - 2018-12-28
 ### Fixed
 - headless can be overriden from environment, for ex: export WEBDRONE_HEADLESS=false

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in webdrone.gemspec
 gemspec
+
+gem 'rake', '~> 12.0'
+gem 'rspec', '~> 3.0'

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/Rakefile

@@ -1,6 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new :spec
 
 task default: :spec

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'webdrone'

data/bin/release-version

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+path = File.realpath File.join(__dir__, '../lib/webdrone/version.rb')
+load path
+
+current = Webdrone::VERSION
+numbers = current.split('.').map(&:to_i)
+length = numbers.count
+
+versions = length.times.map do |index|
+  version = numbers.dup
+  version[index] += index.zero? ? 1 : 2
+  index += 1
+  (index...length).each do |i|
+    version[i] = 0
+  end
+  version.join '.'
+end.reverse
+
+text = versions.each_with_index.map do |version, index|
+  "#{index + 1}. #{version}"
+end.join("\n")
+
+puts <<~FIN
+
+  Version file: #{path}
+
+  Current version: #{current}. Choose next version:
+  #{text}
+
+FIN
+
+print 'Choose? [1]'
+option = gets.strip
+
+index = option == '' ? 0 : option.to_i - 1
+version = versions[index]
+raise "Invalid option #{option}" unless version
+
+`ruby -p -i -e 'gsub /#{current}/,"#{version}"' #{path}`
+puts `bundle; git add #{path} Gemfile.lock; git commit -m "Version #{version}."; git tag v#{version}`
+
+puts <<~FIN
+
+  Press enter to git push or CTRL+C to cancel
+
+FIN
+
+print 'git push origin master --tags'
+gets
+puts `git push origin master --tags`
+
+puts 'rake release'
+gets
+puts `rake release`

data/lib/webdrone.rb

@@ -53,8 +53,9 @@ module Webdrone
   end
 
   def self.irb_console(binding = nil)
-    puts "Webdrone: Webdrone.irb_console IS DEPRECATED, please use a0.console instead."
+    puts 'Webdrone: Webdrone.irb_console IS DEPRECATED, please use a0.console instead.'
     return if IRB.CurrentContext && !binding
+
     binding ||= Kernel.binding.of_caller(1)
     IRB.start_session(binding)
   end
@@ -62,7 +63,7 @@ module Webdrone
   Webdrone.running_pry = false
   def self.pry_console(binding = nil)
     if Webdrone.running_pry
-      puts "Webdrone: pry console already running."
+      puts 'Webdrone: pry console already running.'
     else
       Webdrone.running_pry = true
       binding ||= Kernel.binding.of_caller(1)
@@ -91,7 +92,7 @@ module IRB
     @CONF[:IRB_RC]&.call(irb.context)
     @CONF[:MAIN_CONTEXT] = irb.context
 
-    trap("SIGINT") do
+    trap('SIGINT') do
       irb.signal_handle
     end
 

data/lib/webdrone/browser.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'English'
+
 module Webdrone
   class Browser
     attr_reader :driver
@@ -14,7 +16,7 @@ module Webdrone
         @firefox_profile['startup.homepage_welcome_url.additional'] = 'about:blank'
         @firefox_profile['browser.download.folderList'] = 2
         @firefox_profile['browser.download.manager.showWhenStarting'] = false
-        @firefox_profile['browser.helperApps.neverAsk.saveToDisk'] = "images/jpeg, application/pdf, application/octet-stream, application/download"
+        @firefox_profile['browser.helperApps.neverAsk.saveToDisk'] = 'images/jpeg, application/pdf, application/octet-stream, application/download'
 
         @firefox_profile
       end
@@ -42,7 +44,7 @@ module Webdrone
       env_update(Kernel.binding) if use_env
 
       if create_outdir || outdir
-        outdir ||= File.join("webdrone_output", Time.new.strftime('%Y%m%d_%H%M%S'))
+        outdir ||= File.join('webdrone_output', Time.new.strftime('%Y%m%d_%H%M%S'))
         conf.outdir = outdir
       end
       outdir = File.join(Dir.pwd, outdir) if !outdir.nil? && !Pathname.new(outdir).absolute?
@@ -54,15 +56,20 @@ module Webdrone
         chrome_options.add_preference 'download.default_directory', outdir
         chrome_options.add_argument '--disable-popup-blocking'
         chrome_options.add_argument '--headless' if headless
-        @driver = Selenium::WebDriver.for browser.to_sym, options: chrome_options, driver_opts: { log_path: "/tmp/chromedriver.#{$$}.log", verbose: true }
+        chrome_options.add_argument '--start-maximized' if maximize
+        maximize = false
+
+        service = Selenium::WebDriver::Service.chrome(args: { log_path: "/tmp/chromedriver.#{$PID}.log", verbose: true })
+        @driver = Selenium::WebDriver.for browser.to_sym, options: chrome_options, service: service
       elsif !outdir.nil? && browser.to_sym == :firefox
         firefox_options ||= Browser.firefox_options
         firefox_profile ||= Browser.firefox_profile
 
         firefox_options.add_argument '-headless' if headless
-        downdir = OS.windows? ? outdir.tr("/", "\\") : outdir
+        downdir = OS.windows? ? outdir.tr('/', '\\') : outdir
         firefox_profile['browser.download.dir'] = downdir
-        @driver = Selenium::WebDriver.for browser.to_sym, profile: firefox_profile, options: firefox_options
+        firefox_options.profile = firefox_profile
+        @driver = Selenium::WebDriver.for browser.to_sym, options: firefox_options
       else
         @driver = Selenium::WebDriver.for browser.to_sym
       end
@@ -121,6 +128,7 @@ module Webdrone
 
     def console(binding = nil)
       return unless conf.developer
+
       binding ||= Kernel.binding.of_caller(1)
       old_error = conf.error
       old_developer = conf.developer
@@ -137,9 +145,9 @@ module Webdrone
     protected
 
     def env_update_bool(binding, var, val_old, val_new)
-      if val_new == "true"
+      if val_new == 'true'
         val_new = true
-      elsif val_new == "false"
+      elsif val_new == 'false'
         val_new = false
       else
         puts "Webdrone: ignoring value '#{val_new}' for boolean parameter #{var}."

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)
@@ -32,7 +32,8 @@ module Webdrone
     end
 
     def error=(val)
-      raise "Invalid value '#{val}' for error" if !%i[raise_report raise ignore].include? val
+      raise "Invalid value '#{val}' for error" unless %i[raise_report raise ignore].include? val
+
       @error = val
     rescue StandardError => error
       Webdrone.report_error(@a0, error)

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]
@@ -133,9 +133,10 @@ module Webdrone
 
   def self.report_error(a0, exception)
     return if a0.conf.error == :ignore
+
     if exception.class != WebdroneError
       exception = WebdroneError.new(exception.message, exception, a0, Kernel.binding.callers)
-      if a0.conf.developer && exception.binding
+      if a0.conf.developer && exception.binding && %i[raise_report].include?(a0.conf.error)
         exception.write_title "STARTING DEVELOPER CONSOLE ON ERROR"
         exception.dump_error_report
         a0.console exception.binding

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/logg.rb

@@ -60,7 +60,7 @@ module Webdrone
 
     def trace(ini, fin, from, lineno, base, method_name, args, result, exception, screenshot)
       exception = "#{exception.class}: #{exception}" if exception
-      printf @format, (fin - ini), base, method_name, args, (result || exception)
+      printf @format, (fin - ini), base, method_name, args, (result || exception) unless a0.conf.logger.to_s == 'quiet'
       CSV.open(@path, "a+") do |csv|
         csv << [ini.strftime('%Y-%m-%d %H:%M:%S.%L %z'), (fin - ini), from, lineno, base, method_name, args, result, exception, screenshot]
       end
@@ -101,9 +101,10 @@ module Webdrone
     def setup_format
       begin
         cols, _line = HighLine.default_instance.terminal.terminal_size
-      rescue StandardError
-        cols = 120
+      rescue StandardError => error
+        puts "ignoring error: #{error}"
       end
+      cols ||= 120
       total = 6 + 15 + 11 + 5
       w = cols - total
       w /= 2

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.8.10"
+  VERSION = '1.16.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
@@ -42,6 +42,7 @@ module Webdrone
       targ = "contains: [#{contains}]" if contains
 
       raise "VRFY: #{callee} [#{text}] text value [#{item.text}] does not comply #{targ}" if attr.nil?
+
       raise "VRFY: #{callee} [#{text}] attr [#{attr}] value [#{item.attribute(attr)}] does not comply #{targ}"
     end
 

data/lib/webdrone/xpath.rb

@@ -27,7 +27,7 @@ module Webdrone
       locator = locator.to_s
       button = descendant(:input)[attr(:type).one_of('submit', 'reset', 'image', 'button')][attr(:id).equals(locator) | attr(:value).is(locator) | attr(:title).is(locator)]
       button += descendant(:button)[attr(:id).equals(locator) | attr(:value).is(locator) | string.n.is(locator) | attr(:title).is(locator)]
-      button += descendant(:input)[attr(:type).equals('image')][attr(:alt).is(locator)]
+      button + descendant(:input)[attr(:type).equals('image')][attr(:alt).is(locator)]
     end
 
     # Match anything returned by either {#link} or {#button}.
@@ -154,7 +154,7 @@ module Webdrone
     #   Id of the 'dd' element or text from preciding 'dt' element content
     def definition_description(locator)
       locator = locator.to_s
-      descendant(:dd)[attr(:id).equals(locator) | previous_sibling(:dt)[string.n.equals(locator)] ]
+      descendant(:dd)[attr(:id).equals(locator) | previous_sibling(:dt)[string.n.equals(locator)]]
     end
 
     protected

data/webdrone.gemspec

@@ -1,6 +1,4 @@
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'webdrone/version'
+require_relative 'lib/webdrone/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'webdrone'
@@ -12,11 +10,17 @@ Gem::Specification.new do |spec|
   spec.description   = 'See webpage for more info.'
   spec.homepage      = 'http://github.com/a0/a0-webdrone-ruby'
   spec.license       = 'MIT'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
-  raise "RubyGems 2.0 or newer is required to protect against public gem pushes." unless spec.respond_to?(:metadata)
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+  raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless spec.respond_to?(:metadata)
+
+  spec.metadata['allowed_push_host']  = 'https://rubygems.org'
+
+  spec.metadata['homepage_uri']       = spec.homepage
+  spec.metadata['source_code_uri']    = 'http://github.com/a0/a0-webdrone-ruby'
+  spec.metadata['changelog_uri']      = 'http://github.com/a0/a0-webdrone-ruby/CHANGELOG.md'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
@@ -29,12 +33,12 @@ 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'
   spec.add_runtime_dependency 'os'
   spec.add_runtime_dependency 'pry'
+  spec.add_runtime_dependency 'rspec'
   spec.add_runtime_dependency 'rubyXL'
   spec.add_runtime_dependency 'selenium-webdriver', '>= 3.5.0'
   spec.add_runtime_dependency 'xpath'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 1.8.10
+  version: 1.16.0
 platform: ruby
 authors:
 - Aldrin Martoq
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-12-28 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solargraph
+  name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,35 +109,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: binding_of_caller
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: os
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -219,6 +219,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -226,6 +227,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/release-version
 - bin/setup
 - lib/webdrone.rb
 - lib/webdrone/browser.rb
@@ -253,7 +255,10 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+  homepage_uri: http://github.com/a0/a0-webdrone-ruby
+  source_code_uri: http://github.com/a0/a0-webdrone-ruby
+  changelog_uri: http://github.com/a0/a0-webdrone-ruby/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -261,16 +266,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A simple selenium webdriver wrapper, ruby version.
 test_files: []