true_automation 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7817185c09008c4bbfc9eb5bc706d7282e4a60309aa85d169c6d663000664c61
-  data.tar.gz: a13df17aadc21dd127a0a65d4acff2fd18c631f64e46fbf1d2b660459da31776
+  metadata.gz: f0bf53dc1f2d8755f2b13e7c63a2b62172225fcc26c8fddfc461963a77ecc595
+  data.tar.gz: 1ca188644cd2411f68f4153b7352fc31a9bf821c5d6613718d6202ef939f641d
 SHA512:
-  metadata.gz: a0cea005c2118dc1ea284e7f697b07ecf31b1cbab7d47fcd95d71cb31d8f1eedc7145a721e5d7206a03941f474b1369e5ea8315d5e946bd40da5f2420a664dd1
-  data.tar.gz: 0ec109cf392b6345449b74928c7c3f1588dd35765da9203b80bb84a5faf33058197dfdd9ced67a643bc953b68fee1ddc018c4438b9a6a81126b8f03ca4712636
+  metadata.gz: 7945c55acaa37f7bf931aed7760648d0abc941ed4b8607ff7166a92290c1a7556eebff9b3627e2bad3d926d0df4fec06a9e9ba969b686052d19567b40ac10baa
+  data.tar.gz: baba5d0a9b3d6ee227cc3c7d89ca759db46d5f9b25c8c57ff0f57ebf870e45cf55ad45df2800b977f0fd49f8f5e53f8b77c98c4bf44c6a32db868874c170b8f4

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)
@@ -81,7 +85,7 @@ module TrueAutomation
           @ta_service = options.delete(:ta_service)
         end
 
-        super(app, options)
+        super(app, **options)
 
         @ta_client = TrueAutomation::Client.new
         @remote = ''
@@ -89,19 +93,20 @@ module TrueAutomation
         options ||= {}
         ta_url = options[:ta_url] || "http://localhost:#{@port}/"
 
-        capabilities = options[:desired_capabilities] || {}
+        capabilities = options[:capabilities] || {}
 
-        if options and options[:browser] == :remote
+        if options && options[:browser] == :remote
           raise 'Remote driver URL is not specified' unless options[:url]
-          capabilities[:taRemoteUrl] = options[:url]
+          input_caps = opts_to_json(options[:capabilities]) || {}
+          browser = opts_browser(options[:capabilities] || Selenium::WebDriver::Options.chrome)
+          capabilities = options_class(browser).new(**input_caps)
+          capabilities.add_preference(:taRemoteUrl, options[:url])
           @remote = ' --remote'
-        else
-          capabilities[:browser] = options[:browser] || :chrome
         end
 
         @options.merge!(browser: :remote,
                         url: ta_url,
-                        desired_capabilities: capabilities)
+                        capabilities: capabilities)
       end
 
       def browser
@@ -111,7 +116,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
 
@@ -142,18 +148,48 @@ module TrueAutomation
       end
 
       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 fetch_options(options)
+        if options.delete(:ta_recorder)
+          @ta_recorder = ' --ta-recorder'
+        end
         if options.key?(:options)
-          browser = options[:options].class.name.split('::')[2]
-          desCaps = Selenium::WebDriver::Remote::Capabilities.send(browser.downcase)
-          opts = options[:options].as_json
-          desCaps[opts.keys.first] = opts[opts.keys.first]
-          options[:desired_capabilities] = desCaps
+          browser = opts_browser(options[:options])
+          opts = opts_to_json(options[:options])
+          desCaps = options_class(browser).new(**opts)
+          options[:capabilities] = desCaps
           options.delete(:options)
         end
         options
       end
 
+      def copy_options(caps, opts)
+        # Add options to capabilities mapping if required
+        opts.keys.each do |key|
+          caps.add_option(key, opts[key])
+        end
+      end
+
       def find_available_port(host)
         server = TCPServer.new(host, rand(9515..65515))
         server.addr[1]

data/lib/true_automation/version.rb

@@ -1,3 +1,3 @@
 module TrueAutomation
-  VERSION = '0.5.6'
+  VERSION = '0.6.0'
 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.6
+  version: 0.6.0
 platform: ruby
 authors:
 - TrueAutomation.IO
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-06-13 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.2.3
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: TrueAutomation.IO