bump and fix rubocop (#158)

* fix rubocop

* fix wrong assert

* update changelog

Author: KazuCocoa

.rubocop.yml

@@ -16,6 +16,8 @@ Metrics/PerceivedComplexity:
   Max: 10
 Metrics/ParameterLists:
   Max: 6
+Lint/NestedMethodDefinition:
+  Enabled: false
 Style/Documentation:
   Enabled: false
 Style/CommentedKeyword:
@@ -24,9 +26,9 @@ Style/PercentLiteralDelimiters:
   Enabled: false
 Style/BracesAroundHashParameters:
   Enabled: false
-Lint/NestedMethodDefinition:
+Style/SymbolArray:
   Enabled: false
 Naming/AccessorMethodName:
   Enabled: false
-Style/SymbolArray:
+Naming/MemoizedInstanceVariableName:
   Enabled: false

CHANGELOG.md

@@ -4,6 +4,7 @@ Read `release_notes.md` for commit level details.
 
 ## [Unreleased]
 ### Enhancements
+- [internal] Update dev libraries
 
 ### Bug fixes
 

appium_lib_core.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard', '~> 0.9.11'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
-  spec.add_development_dependency 'webmock', '~> 3.1.0'
-  spec.add_development_dependency 'rubocop', '0.51.0'
-  spec.add_development_dependency 'appium_thor', '~> 0.0', '>= 0.0.7'
+  spec.add_development_dependency 'webmock', '~> 3.4.0'
+  spec.add_development_dependency 'rubocop', '0.60.0'
+  spec.add_development_dependency 'appium_thor', '~> 1.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'parallel_tests'

lib/appium_lib_core.rb

@@ -20,11 +20,11 @@ def self.symbolize_keys(hash)
 
     hash.each_with_object({}) do |pair, acc|
       key = begin
-        pair[0].to_sym
-      rescue StandardError => e
-        ::Appium::Logger.warn(e.message)
-        pair[0]
-      end
+              pair[0].to_sym
+            rescue StandardError => e
+              ::Appium::Logger.warn(e.message)
+              pair[0]
+            end
 
       value = pair[1]
       acc[key] = value.is_a?(Hash) ? symbolize_keys(value) : value

lib/appium_lib_core/android/device.rb

@@ -294,10 +294,13 @@ def toggle_location_services
             ::Appium::Core::Device.add_endpoint_method(:start_activity) do
               def start_activity(opts)
                 raise 'opts must be a hash' unless opts.is_a? Hash
+
                 app_package = opts[:app_package]
                 raise 'app_package is required' unless app_package
+
                 app_activity = opts[:app_activity]
                 raise 'app_activity is required' unless app_activity
+
                 app_wait_package  = opts.fetch(:app_wait_package, '')
                 app_wait_activity = opts.fetch(:app_wait_activity, '')
 

lib/appium_lib_core/android/device/emulator.rb

@@ -135,19 +135,15 @@ def gsm_voice(state)
 
             ::Appium::Core::Device.add_endpoint_method(:set_network_speed) do
               def set_network_speed(netspeed)
-                unless NET_SPEED.member? netspeed.to_sym
-                  raise "The netspeed should be member of #{NET_SPEED}. Not #{netspeed}."
-                end
+                raise "The netspeed should be member of #{NET_SPEED}. Not #{netspeed}." unless NET_SPEED.member? netspeed.to_sym
 
                 execute(:set_network_speed, {}, { netspeed: netspeed })
               end
             end
 
             ::Appium::Core::Device.add_endpoint_method(:set_power_capacity) do
               def set_power_capacity(percent)
-                unless (0..100).member? percent
-                  raise "The  percent should be between 0 and 100. Not #{percent}."
-                end
+                raise "The  percent should be between 0 and 100. Not #{percent}." unless (0..100).member? percent
 
                 execute(:set_power_capacity, {}, { percent: percent })
               end

lib/appium_lib_core/android/device/screen.rb

@@ -24,6 +24,7 @@ def start_recording_screen(remote_path: nil, user: nil, pass: nil, method: 'PUT'
 
                 unless bug_report.nil?
                   raise 'bug_report should be true or false' unless [true, false].member?(bug_report)
+
                   option[:bugReport] = bug_report
                 end
 

lib/appium_lib_core/common/base/bridge.rb

@@ -25,6 +25,7 @@ def self.handshake(**opts)
             unless ::Selenium::WebDriver::Remote::Capabilities.respond_to?(desired_capabilities)
               raise ::Selenium::WebDriver::Error::WebDriverError, "invalid desired capability: #{desired_capabilities.inspect}"
             end
+
             desired_capabilities = ::Selenium::WebDriver::Remote::Capabilities.__send__(desired_capabilities)
           end
 
@@ -105,9 +106,7 @@ def create_session(desired_capabilities)
             end
           end
 
-          unless @session_id
-            raise ::Selenium::WebDriver::Error::WebDriverError, 'no sessionId in returned payload'
-          end
+          raise ::Selenium::WebDriver::Error::WebDriverError, 'no sessionId in returned payload' unless @session_id
 
           json_create(oss_status, value)
         end

lib/appium_lib_core/common/base/search_context.rb

@@ -4,6 +4,7 @@ class Base
       module SearchContext
         # referenced: ::Selenium::WebDriver::SearchContext
 
+        # rubocop:disable Layout/AlignHash
         FINDERS = ::Selenium::WebDriver::SearchContext::FINDERS.merge(
           accessibility_id:     'accessibility id',
           image:                '-image',
@@ -20,6 +21,7 @@ module SearchContext
           # Tizen
           tizen_uiautomation:   '-tizen uiautomation'
         )
+        # rubocop:enable Layout/AlignHash
 
         #
         # Find the first element matching the given arguments
@@ -119,6 +121,7 @@ def find_elements(*args)
         def _set_by_from_finders(how)
           by = FINDERS[how.to_sym]
           raise ArgumentError, "cannot find element by #{how.inspect}. Available finders are #{FINDERS.keys}." unless by
+
           by
         end
 
@@ -129,15 +132,12 @@ def extract_args(args)
           when 1
             arg = args.first
 
-            unless arg.respond_to?(:shift)
-              raise ArgumentError, "expected #{arg.inspect}:#{arg.class} to respond to #shift"
-            end
+            raise ArgumentError, "expected #{arg.inspect}:#{arg.class} to respond to #shift" unless arg.respond_to?(:shift)
 
             # this will be a single-entry hash, so use #shift over #first or #[]
             arr = arg.dup.shift
-            unless arr.size == 2
-              raise ArgumentError, "expected #{arr.inspect} to have 2 elements"
-            end
+
+            raise ArgumentError, "expected #{arr.inspect} to have 2 elements" unless arr.size == 2
 
             arr
           else

lib/appium_lib_core/common/command/common.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Layout/AlignHash
 module Appium
   module Core
     # ref: https://github.com/appium/appium-base-driver/blob/master/lib/mjsonwp/routes.js
@@ -87,3 +88,4 @@ module Commands
     end # module Commands
   end # module Core
 end # module Appium
+# rubocop:enable Layout/AlignHash

lib/appium_lib_core/common/command/mjsonwp.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Layout/AlignHash
 module Appium
   module Core
     module Commands
@@ -12,3 +13,4 @@ module MJSONWP
     end # module Commands
   end # module Core
 end # Appium
+# rubocop:enable Layout/AlignHash

lib/appium_lib_core/common/command/w3c.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Layout/AlignHash
 module Appium
   module Core
     module Commands
@@ -40,3 +41,4 @@ module W3C
     end # module Commands
   end # module Core
 end # module Appium
+# rubocop:enable Layout/AlignHash

lib/appium_lib_core/common/device/image_comparison.rb

@@ -111,12 +111,12 @@ def match_images_features(first_image:,
             unless MATCH_FEATURES[:detector_name].member?(detector_name.to_s)
               raise "detector_name should be #{MATCH_FEATURES[:detector_name]}"
             end
+
             unless MATCH_FEATURES[:match_func].member?(match_func.to_s)
               raise "match_func should be #{MATCH_FEATURES[:match_func]}"
             end
-            unless MATCH_FEATURES[:visualize].member?(visualize)
-              raise "visualize should be #{MATCH_FEATURES[:visualize]}"
-            end
+
+            raise "visualize should be #{MATCH_FEATURES[:visualize]}" unless MATCH_FEATURES[:visualize].member?(visualize)
 
             options = {}
             options[:detectorName] = detector_name.to_s.upcase
@@ -128,9 +128,7 @@ def match_images_features(first_image:,
           end
 
           def find_image_occurrence(full_image:, partial_image:, visualize: false, threshold: nil)
-            unless MATCH_TEMPLATE[:visualize].member?(visualize)
-              raise "visualize should be #{MATCH_TEMPLATE[:visualize]}"
-            end
+            raise "visualize should be #{MATCH_TEMPLATE[:visualize]}" unless MATCH_TEMPLATE[:visualize].member?(visualize)
 
             options = {}
             options[:visualize] = visualize
@@ -140,9 +138,7 @@ def find_image_occurrence(full_image:, partial_image:, visualize: false, thresho
           end
 
           def get_images_similarity(first_image:, second_image:, visualize: false)
-            unless GET_SIMILARITY[:visualize].member?(visualize)
-              raise "visualize should be #{GET_SIMILARITY[:visualize]}"
-            end
+            raise "visualize should be #{GET_SIMILARITY[:visualize]}" unless GET_SIMILARITY[:visualize].member?(visualize)
 
             options = {}
             options[:visualize] = visualize

lib/appium_lib_core/common/device/screen_record.rb

@@ -28,6 +28,7 @@ def initialize(remote_path: nil, user: nil, pass: nil, method: 'PUT', force_rest
             return if force_restart.nil?
 
             raise 'force_restart should be true or false' unless [true, false].member?(force_restart)
+
             @upload_option[:forceRestart] = force_restart
           end
 

lib/appium_lib_core/device.rb

@@ -45,6 +45,7 @@ def add_endpoint_method(method)
         # @private CoreBridge
         def extend_webdriver_with_forwardable
           return if ::Appium::Core::Base::Driver.is_a? Forwardable
+
           ::Appium::Core::Base::Driver.class_eval do
             extend Forwardable
           end
@@ -58,6 +59,7 @@ def delegate_from_appium_driver(method, delegation_target = :driver)
 
         def delegate_driver_method(method)
           return if ::Appium::Core::Base::Driver.method_defined? method
+
           ::Appium::Core::Base::Driver.class_eval { def_delegator :@bridge, method }
         end
 

lib/appium_lib_core/driver.rb

@@ -132,12 +132,16 @@ def self.for(opts = {})
         new(opts)
       end
 
+      private
+
       # @private
       # For testing purpose of delegate_from_appium_driver
-      private def delegated_target_for_test
+      def delegated_target_for_test
         @delegate_target
       end
 
+      public
+
       # @private
       def initialize(opts = {})
         @delegate_target = self # for testing purpose
@@ -227,7 +231,7 @@ def start_driver(server_url: nil,
       private
 
       def create_http_client(http_client: nil, open_timeout: nil, read_timeout: nil)
-        @http_client ||= http_client ? http_client : Appium::Core::Base::Http::Default.new
+        @http_client ||= http_client || Appium::Core::Base::Http::Default.new
 
         # open_timeout and read_timeout are explicit wait.
         @http_client.open_timeout = open_timeout if open_timeout
@@ -257,7 +261,7 @@ def set_implicit_wait_by_default(wait)
       #
       def quit_driver
         @driver.quit
-      rescue # rubocop:disable Lint/RescueWithoutErrorClass
+      rescue # rubocop:disable Style/RescueStandardError
         nil
       end
 
@@ -284,6 +288,7 @@ def appium_server_version
         @driver.remote_status
       rescue Selenium::WebDriver::Error::ServerError => e
         raise ::Appium::Core::Error::ServerError unless e.message.include?('status code 500')
+
         # driver.remote_status returns 500 error for using selenium grid
         {}
       end
@@ -444,6 +449,7 @@ def set_automation_name
       # @private
       def set_automation_name_if_nil
         return unless @automation_name.nil?
+
         @automation_name = if @driver.capabilities['automationName']
                              @driver.capabilities['automationName'].downcase.strip.intern
                            end

lib/appium_lib_core/patch.rb

@@ -68,3 +68,4 @@ def location_rel(driver)
     end
   end # module Core
 end # module Appium
+# rubocop:enable Style/ClassAndModuleChildren

script/commands.rb

@@ -40,7 +40,7 @@ def get_mjsonwp_routes(to_path = './mjsonwp_routes.js')
     end
 
     # @private
-    HTTP_METHOD_MATCH = /GET:|POST:|DELETE:|PUT:|PATCH:/
+    HTTP_METHOD_MATCH = /GET:|POST:|DELETE:|PUT:|PATCH:/.freeze
     # @private
     WD_HUB_PREFIX_MATCH = "'/wd/hub/".freeze
 

test/functional/android/android/device_test.rb

@@ -425,3 +425,4 @@ def text(value)
     end
   end
 end
+# rubocop:enable Style/ClassVars

test/functional/android/android/image_comparison_test.rb

@@ -62,3 +62,4 @@ def test_image_comparison_get_images_result
     end
   end
 end
+# rubocop:enable Style/ClassVars

test/functional/android/android/search_context_test.rb

@@ -23,3 +23,4 @@ def test_uiautomation
     end
   end
 end
+# rubocop:enable Style/ClassVars

test/functional/android/driver_test.rb

@@ -50,7 +50,7 @@ def test_click_back
       error = assert_raises ::Selenium::WebDriver::Error::StaleElementReferenceError do
         e.click
       end
-      assert error.message 'does not exist'
+      assert_equal 'does not exist', error.message
       @driver.back
     end
 
@@ -76,3 +76,4 @@ def test_mobile_perform_action
     # TODO: call @driver.quit after tests
   end
 end
+# rubocop:enable Style/ClassVars

test/functional/android/patch_test.rb

@@ -40,3 +40,4 @@ def test_location_rel
     end
   end
 end
+# rubocop:enable Style/ClassVars

test/functional/android/webdriver/device_test.rb

@@ -68,7 +68,7 @@ def test_page_source
         xml = REXML::Document.new s_source
 
         assert s_source.include?('io.appium.android.apis')
-        assert_equal expected, xml[1].elements.each('//*') { |v| v }.map(&:name)
+        assert_equal expected, xml[1].elements.each('//*') { |v| v }.map(&:name) # rubocop:disable Lint/Void:
       end
 
       # def test_location
@@ -146,3 +146,4 @@ def test_session_capability
     end
   end
 end
+# rubocop:enable Style/ClassVars

test/functional/android/webdriver/w3c_actions_test.rb

@@ -138,3 +138,4 @@ def test_multiple_actions
     end
   end
 end
+# rubocop:enable Style/ClassVars

test/functional/ios/driver_test.rb

@@ -56,3 +56,4 @@ def test_click_back
     # TODO: call @driver.quit after tests
   end
 end
+# rubocop:enable Style/ClassVars

test/functional/ios/ios/device_test.rb

@@ -305,3 +305,4 @@ def test_battery_info
     end
   end
 end
+# rubocop:enable Style/ClassVars

test/functional/ios/ios/image_comparison_test.rb

@@ -58,3 +58,4 @@ def test_image_comparison_get_images_result
     end
   end
 end
+# rubocop:enable Style/ClassVars

test/functional/ios/ios/mjpeg_server_test.rb

@@ -24,3 +24,4 @@ def test_config
     end
   end
 end
+# rubocop:enable Style/ClassVars