webdrone 1.10.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54033552a41d39468377a85f94dab87190f0e390488835a37b13647503950189
-  data.tar.gz: 874c198bc2ae7167600be37ad096c744b82b5cd3fc88ad53a854020e1c8062d7
+  metadata.gz: 3280a123629a2b7fe840fe9bbecf008505491bd91ea26fca460d75bdcd1e0954
+  data.tar.gz: 28cc5a4b420bbc4ddf6366770a026520226a57c43bd9d77f5ee637e1ba226a95
 SHA512:
-  metadata.gz: 529391d94128a9d0e7bd0ab5ff68de96e8991e8d4400e9e5446e74572fe651505ae57caa9e48ca880bea72ac0b020d212b39bfe368309476a9ed79526b1c5062
-  data.tar.gz: 40f4855afbfe706c0821936cd302364edd0d16fd24b65c227eea1a7f139614d08678b69ce7b8915af5a642259b1a476ff37cc5145b4f2a2ba4d73d017fa4a53b
+  metadata.gz: 66a68b1424ae2b20c147737d1fb9d7558c25fef7ecfab9e246efd7c44783b2862774b6a69ab43f29e137a100bf2fcc9121299a37360a42ace9da8740cda1ae0c
+  data.tar.gz: 931af4c68353750296c315a54fcffdda78447f5b0e2311372f233fd9131b6071c86986f8cf44083fb77a34d88373ea1c0cd9c3b67553e91907a6a797886bd9bd

data/.rubocop.relaxed.yml

@@ -1,5 +1,5 @@
 # Relaxed.Ruby.Style
-## Version 2.4
+## Version 2.5
 
 Style/Alias:
   Enabled: false
@@ -145,29 +145,8 @@ Lint/AssignmentInCondition:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#lintassignmentincondition
 
-Metrics/AbcSize:
+Layout/LineLength:
   Enabled: false
 
-Metrics/BlockNesting:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
+Metrics:
   Enabled: false

data/.rubocop.yml

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

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.4
+ruby 2.7.3

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,84 @@ New features are summarized here.
 
 
 
+## v.1.18.0 - 2021-04-24
+### Changed
+- Minimum Ruby version supported is now >= 2.6
+- Added support to Ruby version 3.0
+
+
+
+## v.1.16.2 - 2021-03-19
+### Fixed
+- Remove rspec from runtime_dependencies.
+
+
+
+## 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.

data/Gemfile

@@ -4,3 +4,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

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

data/lib/webdrone.rb

@@ -36,8 +36,8 @@ module Webdrone
   class << self
     attr_accessor :running_pry, :irb_setup_done
 
-    def create(*args)
-      a0 = Webdrone::Browser.new(*args)
+    def create(*args, **kwargs)
+      a0 = Webdrone::Browser.new(*args, **kwargs)
       if block_given?
         begin
           yield a0

data/lib/webdrone/browser.rb

@@ -145,9 +145,10 @@ module Webdrone
     protected
 
     def env_update_bool(binding, var, val_old, val_new)
-      if val_new == 'true'
+      case val_new
+      when 'true'
         val_new = true
-      elsif val_new == 'false'
+      when 'false'
         val_new = false
       else
         puts "Webdrone: ignoring value '#{val_new}' for boolean parameter #{var}."
@@ -160,7 +161,7 @@ module Webdrone
     def env_update(binding)
       bool_vars = %i[create_outdir developer quit_at_exit maximize headless]
       ENV.keys.select { |env| env.start_with? 'WEBDRONE_' }.each do |env|
-        var = env[9..-1].downcase.to_sym
+        var = env[9..].downcase.to_sym
         if binding.local_variable_defined? var
           val_old = binding.local_variable_get(var)
           val_new = ENV[env]

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

@@ -14,8 +14,8 @@ module Webdrone
 
       begin
         # find location of user error
-        bindings[0..-1].each do |binding|
-          location = { path: binding.eval('__FILE__'), lineno: binding.eval('__LINE__') }
+        bindings[0..].each do |binding|
+          location = { path: binding.source_location[0], lineno: binding.source_location[1] }
           next unless Gem.path.none? { |path| location[:path].include? path }
 
           @location = location
@@ -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]
@@ -136,7 +136,7 @@ module Webdrone
 
     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)
@@ -69,9 +69,10 @@ module Webdrone
 
     def choose(list, n, all, visible, scroll)
       list = list.select do |x|
-        if visible == true
+        case visible
+        when true
           x.displayed?
-        elsif visible == false
+        when false
           !x.displayed?
         else
           true

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

@@ -7,6 +7,8 @@ module Webdrone
     end
 
     def initialize(methods = nil)
+      super()
+
       @methods = methods
     end
 
@@ -16,25 +18,26 @@ module Webdrone
       base.class_eval do
         method_list.each do |method_name|
           original_method = instance_method(method_name)
-          define_method method_name do |*args, &block|
+          define_method method_name do |*args, **kwargs, &block|
             caller_location = Kernel.caller_locations[0]
             cl_path = caller_location.path
             cl_line = caller_location.lineno
             if @a0.conf.logger && Gem.path.none? { |path| cl_path.include? path }
               ini = ::Webdrone::MethodLogger.last_time ||= Time.new
               ::Webdrone::MethodLogger.screenshot = nil
+              args_log = [args, kwargs].compact.reject(&:empty?).map(&:to_s).join(' ')
               begin
-                result = original_method.bind(self).call(*args, &block)
+                result = original_method.bind(self).call(*args, **kwargs, &block)
                 fin = ::Webdrone::MethodLogger.last_time = Time.new
-                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args, result, nil, ::Webdrone::MethodLogger.screenshot)
+                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args_log, result, nil, ::Webdrone::MethodLogger.screenshot)
                 result
               rescue StandardError => exception
                 fin = ::Webdrone::MethodLogger.last_time = Time.new
-                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args, nil, exception, ::Webdrone::MethodLogger.screenshot)
+                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args_log, nil, exception, ::Webdrone::MethodLogger.screenshot)
                 raise exception
               end
             else
-              original_method.bind(self).call(*args, &block)
+              original_method.bind(self).call(*args, **kwargs, &block)
             end
           end
         end
@@ -60,7 +63,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
@@ -80,8 +83,8 @@ module Webdrone
       rescue StandardError => e
         exception = e
         bindings = Kernel.binding.callers
-        bindings[0..-1].each do |binding|
-          location = { path: binding.eval('__FILE__'), lineno: binding.eval('__LINE__') }
+        bindings[0..].each do |binding|
+          location = { path: binding.source_location[0], lineno: binding.source_location[1] }
           next unless Gem.path.none? { |path| location[:path].include? path }
 
           result[:exception] = {}
@@ -93,7 +96,7 @@ module Webdrone
       end
       result[:trace_count] = @group_trace_count.pop
       fin = Time.new
-      trace(ini, fin, cl_path, cl_line, Logs, :with_group, [name, abort_error: abort_error], result, exception, nil)
+      trace(ini, fin, cl_path, cl_line, Logs, :with_group, [name, { abort_error: abort_error }], result, exception, nil)
       puts "abort_error: #{abort_error} exception: #{exception}"
       exit if abort_error == true && exception
     end

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.18.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/lib/webdrone/wait.rb

@@ -20,11 +20,9 @@ module Webdrone
       @ignore << Selenium::WebDriver::Error::InvalidSelectorError
     end
 
-    def for
+    def for(&block)
       if @a0.conf.timeout
-        Selenium::WebDriver::Wait.new(timeout: @a0.conf.timeout, ignore: @ignore).until do
-          yield
-        end
+        Selenium::WebDriver::Wait.new(timeout: @a0.conf.timeout, ignore: @ignore).until(&block)
       else
         yield
       end

data/lib/webdrone/xpath.rb

@@ -58,8 +58,7 @@ module Webdrone
     def field(locator)
       locator = locator.to_s
       xpath = descendant(:input, :textarea, :select)[~attr(:type).one_of('submit', 'image', 'hidden')]
-      xpath = locate_field(xpath, locator)
-      xpath
+      locate_field(xpath, locator)
     end
 
     # Match any `input` or `textarea` element that can be filled with text.
@@ -72,8 +71,7 @@ module Webdrone
     def fillable_field(locator)
       locator = locator.to_s
       xpath = descendant(:input, :textarea)[~attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')]
-      xpath = locate_field(xpath, locator)
-      xpath
+      locate_field(xpath, locator)
     end
 
     # Match any `select` element.

data/webdrone.gemspec

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-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'
@@ -14,12 +12,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.6.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'
+  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'
@@ -32,7 +35,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.18.0
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2021-04-25 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
@@ -255,6 +241,9 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  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:
@@ -263,14 +252,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A simple selenium webdriver wrapper, ruby version.