refactor: collect no agrs in core/command (#675)

Author: KazuCocoa

lib/appium_lib/core/android/device.rb

@@ -14,38 +14,6 @@ module Device
       #   background_app(-1) #=> the app never come back. https://github.com/appium/appium/issues/7741
       #   ```
 
-      # @!method current_activity
-      #   Get current activity name
-      #   @return [String] An activity name
-      #
-      #   ```ruby
-      #   current_activity # '.ApiDemos'
-      #   ```
-
-      # @!method current_package
-      #   Get current package name
-      #   @return [String] A package name
-      #
-      #   ```ruby
-      #   current_package # 'com.example.android.apis'
-      #   ```
-
-      # @!method get_system_bars
-      #   Get system bar's information
-      #   @return [String] System bar
-      #
-      #   ```ruby
-      #   get_system_bars
-      #   ```
-
-      # @!method get_display_density
-      #   Get connected device's density.
-      #   @return [Integer] The size of density
-      #
-      #   ```ruby
-      #   get_display_density # 320
-      #   ```
-
       # @!method hide_keyboard
       #   Hide the onscreen keyboard
       #   @param [String] close_key The name of the key which closes the keyboard.
@@ -78,10 +46,6 @@ module Device
       #     app_activity: '.accessibility.AccessibilityNodeProviderActivity'
       #   ```
 
-      # @!method get_network_connection
-      #   Get the device network connection current status
-      #   See set_network_connection method for return value
-
       # @!method set_network_connection
       #   Set the device network connection mode
       #   @param [String] path Bit mask that represent the network mode
@@ -118,10 +82,6 @@ class << self
         def extended(_mod)
           Appium::Core::Device.extend_webdriver_with_forwardable
 
-          ::Appium::Core::Commands::COMMAND_NO_ARG_ANDROID.each_key do |method|
-            Appium::Core::Device.add_endpoint_method method
-          end
-
           # Android
           Appium::Core::Device.add_endpoint_method(:start_activity) do
             def start_activity(opts)
@@ -143,7 +103,7 @@ def start_activity(opts)
             end
           end
 
-          # Android
+          # Android, Override
           Appium::Core::Device.add_endpoint_method(:hide_keyboard) do
             def hide_keyboard(close_key = nil, strategy = nil)
               option = {}

lib/appium_lib/core/common/command.rb

@@ -5,16 +5,16 @@ module Core
     # ref: https://github.com/appium/appium-base-driver/blob/master/lib/mjsonwp/routes.js
     module Commands
       COMMAND_NO_ARG = {
+        # Common
         shake:                      [:post, 'session/:session_id/appium/device/shake'.freeze],
         launch_app:                 [:post, 'session/:session_id/appium/app/launch'.freeze],
         close_app:                  [:post, 'session/:session_id/appium/app/close'.freeze],
         reset:                      [:post, 'session/:session_id/appium/app/reset'.freeze],
         device_locked?:             [:post, 'session/:session_id/appium/device/is_locked'.freeze],
         device_time:                [:get,  'session/:session_id/appium/device/system_time'.freeze],
-        current_context:            [:get,  'session/:session_id/context'.freeze]
-      }.freeze
+        current_context:            [:get,  'session/:session_id/context'.freeze],
 
-      COMMAND_NO_ARG_ANDROID = {
+        # Android
         open_notifications:         [:post, 'session/:session_id/appium/device/open_notifications'.freeze],
         toggle_airplane_mode:       [:post, 'session/:session_id/appium/device/toggle_airplane_mode'.freeze],
         current_activity:           [:get,  'session/:session_id/appium/device/current_activity'.freeze],
@@ -23,12 +23,12 @@ module Commands
         get_display_density:        [:get,  'session/:session_id/appium/device/display_density'.freeze],
         is_keyboard_shown:          [:get,  'session/:session_id/appium/device/is_keyboard_shown'.freeze],
         get_network_connection:     [:get,  'session/:session_id/network_connection'.freeze],
-        get_performance_data_types: [:post, 'session/:session_id/appium/performanceData/types'.freeze]
-      }.freeze
+        get_performance_data_types: [:post, 'session/:session_id/appium/performanceData/types'.freeze],
 
-      COMMAND_NO_ARG_IOS = {
+        # iOS
       }.freeze
 
+      # Some commands differ for each driver.
       COMMAND = {
         # common
         available_contexts:         [:get,  'session/:session_id/contexts'.freeze],
@@ -65,7 +65,7 @@ module Commands
       }.freeze
 
       COMMANDS = {}.merge(COMMAND).merge(COMMAND_ANDROID).merge(COMMAND_IOS)
-                   .merge(COMMAND_NO_ARG).merge(COMMAND_NO_ARG_ANDROID).merge(COMMAND_NO_ARG_IOS).freeze
+                   .merge(COMMAND_NO_ARG).freeze
 
       COMMANDS_EXTEND_OSS = COMMANDS.merge(::Appium::Core::Base::Commands::OSS).freeze
       COMMANDS_EXTEND_W3C = COMMANDS.merge(::Appium::Core::Base::Commands::W3C).freeze

lib/appium_lib/core/common/device.rb

@@ -140,6 +140,10 @@ module Device
       #   set_immediate_value element, 'hello'
       #   ```
 
+      # @!method get_network_connection
+      #   Get the device network connection current status
+      #   See set_network_connection method for return value
+
       class << self
         def extended(_mod)
           extend_webdriver_with_forwardable

lib/appium_lib/core/ios/device.rb

@@ -25,10 +25,6 @@ class << self
         def extended(_mod)
           ::Appium::Core::Device.extend_webdriver_with_forwardable
 
-          ::Appium::Core::Commands::COMMAND_NO_ARG_IOS.each_key do |method|
-            ::Appium::Core::Device.add_endpoint_method method
-          end
-
           # TODO: TEST ME
           ::Appium::Core::Device.add_endpoint_method(:touch_id) do
             def touch_id(match = true)

lib/appium_lib/core/ios/xcuitest/device.rb

@@ -30,6 +30,7 @@ class << self
           def extended(_mod)
             ::Appium::Core::Device.extend_webdriver_with_forwardable
 
+            # Override
             ::Appium::Core::Device.add_endpoint_method(:hide_keyboard) do
               def hide_keyboard(close_key = nil, strategy = nil)
                 option = {}
@@ -41,6 +42,7 @@ def hide_keyboard(close_key = nil, strategy = nil)
               end
             end
 
+            # Override
             ::Appium::Core::Device.add_endpoint_method(:background_app) do
               def background_app(duration = 0)
                 # https://github.com/appium/ruby_lib/issues/500, https://github.com/appium/appium/issues/7741