fix: Tweak screen option (#256)

* tweak screen option

* update

* fix robocop

Author: KazuCocoa

CHANGELOG.md

@@ -10,7 +10,7 @@ Read `release_notes.md` for commit level details.
 
 ### Deprecations
 
-## [3.6.0] - 2020-03-15
+## [3.6.1, 3.6.0] - 2020-03-15
 
 ### Enhancements
 - Add screen record feature for Windows driver (https://github.com/appium/appium-windows-driver/pull/66)

lib/appium_lib_core/android/device.rb

@@ -245,6 +245,8 @@ module Device
         # @param [Boolean] bug_report Set it to +true+ in order to display additional information on the video overlay,
         #                             such as a timestamp, that is helpful in videos captured to illustrate bugs.
         #                             This option is only supported since API level 27 (Android P).
+        # @return [String] Base64 encoded content of the recorded media file or an empty string
+        #                  if the file has been successfully uploaded to a remote location (depends on the actual options)
         #
         # @example
         #

lib/appium_lib_core/ios/xcuitest/device.rb

@@ -91,6 +91,8 @@ module Device
           #                             - https://www.reddit.com/r/linux4noobs/comments/671z6b/width_not_divisible_by_2_error_when_using_ffmpeg/
           # @param [String] pixel_format Output pixel format. Run +ffmpeg -pix_fmts+ to list possible values.
           #                              For Quicktime compatibility, set to "yuv420p" along with videoType: "libx264".
+          # @return [String] Base64 encoded content of the recorded media file or an empty string
+          #                  if the file has been successfully uploaded to a remote location (depends on the actual options)
           #
           # @example
           #

lib/appium_lib_core/windows/device.rb

@@ -29,21 +29,8 @@ module Device
         # This method requires FFMPEG (https://www.ffmpeg.org/download.html) to be installed and present in PATH.
         # The resulting video uses H264 codec and is ready to be played by media players built-in into web browsers.
         #
-        # @param [String] remote_path The path to the remote location, where the resulting video should be uploaded.
-        #                             The following protocols are supported: http/https, ftp.
-        #                             Null or empty string value (the default setting) means the content of resulting
-        #                             file should be encoded as Base64 and passed as the endpount response value.
-        #                             An exception will be thrown if the generated media file is too big to
-        #                             fit into the available process memory.
-        #                             This option only has an effect if there is screen recording process in progreess
-        #                             and +forceRestart+ parameter is not set to +true+.
-        # @param [String] user The name of the user for the remote authentication.
-        # @param [String] pass The password for the remote authentication.
-        # @param [String] method The http multipart upload method name. The 'PUT' one is used by default.
-        # @param [Boolean] force_restart Whether to try to catch and upload/return the currently running screen recording
-        #                                (+false+, the default setting on server) or ignore the result of it
-        #                                and start a new recording immediately (+true+).
-        # @param [String] time_limit Recording time. 180 seconds is by default.
+        # @param [Boolean] force_restart Whether to stop existing recording process forcefully and start a new recording process.
+        # @param [String] time_limit Recording time. 600 seconds is by default.
         # @param [Number|String] fps The count of frames per second in the resulting video.
         #                            Increasing fps value also increases the size of the resulting
         #                            video file and the CPU usage. Defaults to 15.
@@ -73,6 +60,7 @@ module Device
         # @param [String] audio_input If provided then the given audio input will be used to record the computer audio
         #                             along with the desktop video. The list of available devices could be retrieved using
         #                             +ffmpeg -list_devices true -f dshow -i dummy+ command.
+        # @return [String] Base64 encoded content of the recorded media file
         #
         # @example
         #

lib/appium_lib_core/windows/device/screen.rb

@@ -20,14 +20,11 @@ module Screen
           def self.add_methods
             ::Appium::Core::Device.add_endpoint_method(:start_recording_screen) do
               # rubocop:disable Metrics/ParameterLists
-              def start_recording_screen(remote_path: nil, user: nil, pass: nil, method: 'PUT',
-                                         force_restart: nil, time_limit: nil,
+              def start_recording_screen(force_restart: nil, time_limit: nil,
                                          fps: nil, preset: nil, video_filter: nil,
                                          capture_clicks: nil, capture_cursor: nil, audio_input: nil)
-                option = ::Appium::Core::Base::Device::ScreenRecord.new(
-                  remote_path: remote_path, user: user, pass: pass, method: method, force_restart: force_restart
-                ).upload_option
-
+                option = {}
+                option[:forceRestart] = force_restart unless force_restart.nil?
                 option[:timeLimit] = time_limit unless time_limit.nil?
                 option[:fps] = fps unless fps.nil?
                 option[:preset] = preset unless preset.nil?