Fix remaining rubocop issues

.rubocop.yml

@@ -26,3 +26,5 @@ Style/AccessorMethodName:
   Enabled: false
 Style/DoubleNegation:
   Enabled: false
+Style/EachWithObject:
+  Enabled: false

Rakefile

@@ -233,5 +233,5 @@ desc 'Execute RuboCop static code analysis'
 RuboCop::RakeTask.new(:rubocop) do |t|
   t.patterns = %w(lib ios_tests android_tests)
   t.options = %w(-D)
-  t.fail_on_error = false
+  t.fail_on_error = true
 end

android_tests/lib/android/specs/driver.rb

@@ -61,11 +61,6 @@ def sauce?
   end
 
   describe 'Appium::Driver' do
-    t '@@loaded' do
-      loaded = $driver.class.class_variable_get :@@loaded
-      loaded.must_equal true
-    end
-
     t '$driver.class' do
       $driver.class.must_equal Appium::Driver
     end

android_tests/lib/run.rb

@@ -40,7 +40,11 @@
   end
 
   fail "\nTest #{one_test} does not exist.\n" unless File.exist?(one_test)
-  Appium::Driver.new(caps).start_driver
+  driver = Appium::Driver.new(caps)
+  # Tests expect methods defined on the minispec object
+  Appium.promote_appium_methods ::Minitest::Spec
+  driver.start_driver
+
   # require support (common.rb)
   Dir.glob(File.join dir, test_dir + '/*.rb') do |test|
     require test

docs/migration.md

@@ -1,6 +1,6 @@
 ### Breaking Changes in 7.0
 
-Requires appium 1.4.0-beta or newer for iOS helper methods.
+Requires appium 1.4.0-beta or newer for iOS helper methods. appium_lib no longer automatically promotes methods on minispec. To restore the old behavior use: `Appium.promote_appium_methods ::Minitest::Spec`
 
            Old | New
             :--|:--

ios_tests/lib/ios/specs/driver.rb

@@ -119,11 +119,6 @@ def sauce?
   end
 
   describe 'Appium::Driver' do
-    t '@@loaded' do
-      loaded = $driver.class.class_variable_get :@@loaded
-      loaded.must_equal true
-    end
-
     t '$driver.class' do
       $driver.class.must_equal Appium::Driver
     end

lib/appium_lib/common/helper.rb

@@ -22,10 +22,8 @@ module Common
 
     # Return block.call and ignore any exceptions.
     def ignore(&block)
-      begin
-        block.call
-      rescue Exception
-      end
+      block.call
+    rescue Exception # rubocop:disable Lint/HandleExceptions, Lint/RescueException
     end
 
     # Navigate back.

lib/appium_lib/common/wait.rb

@@ -32,7 +32,7 @@ def _generic_wait(opts = {}, &block)
           end
         rescue ::Errno::ECONNREFUSED => e
           raise e
-        rescue *ignored => last_error
+        rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
           # swallowed
         end
 

lib/appium_lib/device/touch_actions.rb

@@ -78,9 +78,9 @@ def release(opts = nil)
     # @option opts [integer] :y y co-ordinate to tap
     # @option opts [integer] :fingers how many fingers to tap with (Default 1)
     def tap(opts)
-      opts[:count]       = opts.delete(:fingers) if opts[:fingers]
-      opts[:count]     ||= 1
-      args               = args_with_ele_ref opts
+      opts[:count] = opts.delete(:fingers) if opts[:fingers]
+      opts[:count] ||= 1
+      args = args_with_ele_ref opts
       chain_method(:tap, args)
     end
 

lib/appium_lib/driver.rb

@@ -140,7 +140,7 @@ def self.symbolize_keys(hash)
     fail 'symbolize_keys requires a hash' unless hash.is_a? Hash
     result = {}
     hash.each do |key, value|
-      key = key.to_sym rescue key
+      key = key.to_sym rescue key # rubocop:disable Style/RescueModifier
       result[key] = value.is_a?(Hash) ? symbolize_keys(value) : value
     end
     result
@@ -216,8 +216,6 @@ def self.promote_appium_methods(class_array)
   end
 
   class Driver
-    @@loaded = false
-
     # attr readers are promoted to global scope. To avoid clobbering, they're
     # made available via the driver_attributes method
     #
@@ -232,6 +230,9 @@ class Driver
     # Export session id to textfile in /tmp for 3rd party tools
     attr_accessor :export_session
     # Default wait time for elements to appear
+    # Returns the default client side wait.
+    # This value is independent of what the server is using
+    # @return [Integer]
     attr_accessor :default_wait
     # Array of previous wait time values
     attr_accessor :last_waits
@@ -246,6 +247,10 @@ class Driver
     # Boolean debug mode for the Appium Ruby bindings
     attr_accessor :appium_debug
 
+    # Returns the driver
+    # @return [Driver] the driver
+    attr_reader :driver
+
     # Creates a new driver
     #
     # ```ruby
@@ -327,14 +332,6 @@ def initialize(opts = {})
       # Save global reference to last created Appium driver for top level methods.
       $driver = self
 
-      # Promote exactly once the first time the driver is created.
-      # Subsequent drivers do not trigger promotion.
-      unless @@loaded
-        @@loaded = true
-        # Promote only on Minitest::Spec (minitest 5) by default
-        Appium.promote_appium_methods ::Minitest::Spec
-      end
-
       self # return newly created driver
     end
 
@@ -436,12 +433,6 @@ def restart
       start_driver
     end
 
-    # Returns the driver
-    # @return [Driver] the driver
-    def driver
-      @driver
-    end
-
     # Takes a png screenshot and saves to the target path.
     #
     # Example: screenshot '/tmp/hi.png'
@@ -457,6 +448,7 @@ def screenshot(png_save_path)
     # @return [void]
     def driver_quit
       # rescue NoSuchDriverError or nil driver
+      # rubocop:disable Style/RescueModifier
       @driver.quit rescue nil
     end
 
@@ -475,6 +467,7 @@ def start_driver
 
         # export session
         if @export_session
+          # rubocop:disable Style/RescueModifier
           File.open('/tmp/appium_lib_session', 'w') do |f|
             f.puts @driver.session_id
           end rescue nil
@@ -523,13 +516,6 @@ def set_wait(timeout = nil)
       @driver.manage.timeouts.implicit_wait = timeout
     end
 
-    # Returns the default client side wait.
-    # This value is independent of what the server is using
-    # @return [Integer]
-    def default_wait
-      @default_wait
-    end
-
     # Returns existence of element.
     #
     # Example: