true_automation 0.5.9 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5899752657a55d787cd0d34e450485baa81ccd00fcb04b39299646dd016404de
-  data.tar.gz: 961a54b9115cc568ec44cfafbc9cb5c530a0d9126a3c3cfcfb0efd6efca81eda
+  metadata.gz: 1cc9e6c269815476bedfdab280e9bdb3f6b501c35bde134ebd1c1701cf894b5c
+  data.tar.gz: 50fa9493181c181937e7c49fc1c0786b62c62964832257b836e6844b20ee7f6a
 SHA512:
-  metadata.gz: '0966514008a28ac8a073065c605b63c41d248159279560042da26459ade761fbed733fe31710a174d9e9450cd335e8ea934cfa8d20776b03a2084cb7984aab58'
-  data.tar.gz: 81eb2f5120ec29af5bc8be0ca2794fd1a947d0a138a192dbe5a16626db5fe3489e6c03a57923ac8037a3a85b2d26c75e6d7a43331e9224350cf99c086dfcb75a
+  metadata.gz: c383abe0231435fdec8372e98cc45b5c8c5b96ec54e673fea2970dfcbc0fec8cc5290d0ed16ade739e8939c12277ce3179b0cb44f2560dd282aecef27c020ad4
+  data.tar.gz: 2d7b326dc4f5d2522d65c4d819d12862e5322a4b3a2f89dd1b7217bd7c5c9e66e94f582e2c6f547128e7998c1782a8d315e7f50b66376f6e680a8b91919a78af

data/lib/true_automation/client.rb

@@ -10,6 +10,7 @@ module TrueAutomation
     def start(options)
       @port = options[:port]
       remote = options[:remote]
+      recorder = options[:ta_recorder]
       ta_debug = options[:ta_debug]
 
       if options[:ta_service]
@@ -31,7 +32,7 @@ module TrueAutomation
       Dir.mkdir('log') unless File.exist?('log')
       logfile = "log/trueautomation-#{Time.now.strftime('%Y%m%dT%H%M%S')}.log"
 
-      @pid = spawn("#{@executable} --log-file #{logfile} --port #{@port}#{driver_path}#{remote}#{ta_debug}")
+      @pid = spawn("#{@executable} --log-file #{logfile} --port #{@port}#{driver_path}#{remote}#{ta_debug}#{recorder}")
       puts "Started TrueAutomation.IO client with pid #{@pid} listening to port #{@port}"
 
       @pid

data/lib/true_automation/driver/appium_lib.rb

@@ -3,13 +3,13 @@ require_relative '../client'
 module TrueAutomation
   module Driver
     class AppiumLib < Appium::Core::Driver
-      def initialize(*args)
+      def initialize(**opts)
         @ta_client = TrueAutomation::Client.new
         @remote = ''
-        super
+        super(**opts)
       end
 
-      def start_driver(*args)
+      def start_driver(**opts)
         @ta_client.start(port: @port,
                          remote: @remote,
                          ta_debug: @ta_debug,
@@ -20,7 +20,7 @@ module TrueAutomation
         at_exit do
           @ta_client.stop
         end
-        super
+        super(**opts)
       end
     end
   end

data/lib/true_automation/driver/capybara.rb

@@ -68,6 +68,10 @@ module TrueAutomation
     class Capybara < Capybara::Selenium::Driver
       def initialize(app, **options)
         options = fetch_options(options)
+        if options[:browser].to_s != 'remote'
+          default_options = Selenium::WebDriver::Options.send(options[:browser] || :chrome)
+        end
+        options[:capabilities] ||= default_options
         @port = options.delete(:port) || find_available_port('localhost')
         @driver = options.delete(:driver)
         @driver_version = options.delete(:driver_version)
@@ -89,19 +93,11 @@ module TrueAutomation
         options ||= {}
         ta_url = options[:ta_url] || "http://localhost:#{@port}/"
 
-        capabilities = options[:capabilities] || {}
+        capabilities = options[:capabilities] || Selenium::WebDriver::Options.chrome
 
-        if options and options[:browser] == :remote
+        if options && options[:browser] == :remote
           raise 'Remote driver URL is not specified' unless options[:url]
-          input_caps = options[:capabilities]&.as_json || {}
-          input_caps = options[:capabilities]&.as_json || {}
-          browser = opts_browser(options[:capabilities] || Selenium::WebDriver::Chrome::Capabilities.new)
-          browser_class_name = browser.to_s.slice(0,1).capitalize + browser.to_s.slice(1..-1)
-          capabilities = browser.to_s == 'remote' ?
-            Selenium::WebDriver::Remote::Options.new :
-            self.class.class_eval("Selenium::WebDriver::#{browser_class_name}::Options").send(browser)
-          copy_options(capabilities, input_caps)
-
+          capabilities = duplicate_options(capabilities)
           capabilities.add_preference(:taRemoteUrl, options[:url])
           @remote = ' --remote'
         end
@@ -118,7 +114,8 @@ module TrueAutomation
                            ta_debug: @ta_debug,
                            driver: @driver,
                            ta_service_path: @ta_service&.executable_path,
-                           driver_version: @driver_version)
+                           driver_version: @driver_version,
+                           ta_recorder: @ta_recorder)
 
           @ta_client.wait_until_start
 
@@ -150,26 +147,51 @@ module TrueAutomation
 
       private
 
+      def options_class(browser)
+        browser.to_s == 'remote' ?
+          Selenium::WebDriver::Remote::Options :
+          eval("Selenium::WebDriver::#{browser_class_name(browser)}::Options")
+      end
+
+      def browser_class_name(browser)
+        browser.to_s.slice(0,1).capitalize + browser.to_s.slice(1..-1)
+      end
+
       def opts_browser(opts)
         opts.class.name.split('::')[2].downcase.to_sym
       end
 
+      def opts_to_json(opts)
+        opts.is_a?(Selenium::WebDriver::Options) ?
+          opts&.options :
+          opts&.as_json
+      end
+
+      def duplicate_options(original_options)
+        browser = opts_browser(original_options || Selenium::WebDriver::Options.chrome)
+        opts = opts_to_json(original_options) || {}
+        capabilities = options_class(browser).new(**opts)
+        original_options.extensions.each do |ext|
+          capabilities.add_extension(ext)
+        end
+        capabilities
+      end
+
       def fetch_options(options)
         if options.key?(:options)
-          browser = opts_browser(options[:options])
-          desCaps = Selenium::WebDriver::Remote::Capabilities.send(browser.downcase)
-          opts = options[:options].as_json
-          copy_options(desCaps, opts)
-          options[:capabilities] = desCaps
+          options[:capabilities] = duplicate_options(options[:options])
           options.delete(:options)
         end
+        if options.delete(:ta_recorder)
+          @ta_recorder = ' --ta-recorder'
+        end
         options
       end
 
       def copy_options(caps, opts)
         # Add options to capabilities mapping if required
         opts.keys.each do |key|
-          caps.add_preference(key, opts[key])
+          caps.add_option(key, opts[key])
         end
       end
 

data/lib/true_automation/version.rb

@@ -1,3 +1,3 @@
 module TrueAutomation
-  VERSION = '0.5.9'
+  VERSION = '0.6.1'
 end

data/true_automation.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'
-  spec.add_development_dependency 'appium_lib', '~> 11.2'
-  spec.add_development_dependency 'appium_lib_core', '~> 4.2'
+  spec.add_development_dependency 'appium_lib', '~> 12.2.2'
+  spec.add_development_dependency 'appium_lib_core', '~> 6.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: true_automation
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.1
 platform: ruby
 authors:
 - TrueAutomation.IO
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: 12.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: 12.2.2
 - !ruby/object:Gem::Dependency
   name: appium_lib_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 6.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 6.4.1
 description: "  true_automation gem enables awesome TrueAutomation.IO features for
   Capybara and Watir projects.\n"
 email:
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: TrueAutomation.IO