true_automation 0.5.6 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7817185c09008c4bbfc9eb5bc706d7282e4a60309aa85d169c6d663000664c61
-  data.tar.gz: a13df17aadc21dd127a0a65d4acff2fd18c631f64e46fbf1d2b660459da31776
+  metadata.gz: 5899752657a55d787cd0d34e450485baa81ccd00fcb04b39299646dd016404de
+  data.tar.gz: 961a54b9115cc568ec44cfafbc9cb5c530a0d9126a3c3cfcfb0efd6efca81eda
 SHA512:
-  metadata.gz: a0cea005c2118dc1ea284e7f697b07ecf31b1cbab7d47fcd95d71cb31d8f1eedc7145a721e5d7206a03941f474b1369e5ea8315d5e946bd40da5f2420a664dd1
-  data.tar.gz: 0ec109cf392b6345449b74928c7c3f1588dd35765da9203b80bb84a5faf33058197dfdd9ced67a643bc953b68fee1ddc018c4438b9a6a81126b8f03ca4712636
+  metadata.gz: '0966514008a28ac8a073065c605b63c41d248159279560042da26459ade761fbed733fe31710a174d9e9450cd335e8ea934cfa8d20776b03a2084cb7984aab58'
+  data.tar.gz: 81eb2f5120ec29af5bc8be0ca2794fd1a947d0a138a192dbe5a16626db5fe3489e6c03a57923ac8037a3a85b2d26c75e6d7a43331e9224350cf99c086dfcb75a

data/lib/true_automation/driver/capybara.rb

@@ -81,7 +81,7 @@ module TrueAutomation
           @ta_service = options.delete(:ta_service)
         end
 
-        super(app, options)
+        super(app, **options)
 
         @ta_client = TrueAutomation::Client.new
         @remote = ''
@@ -89,19 +89,26 @@ module TrueAutomation
         options ||= {}
         ta_url = options[:ta_url] || "http://localhost:#{@port}/"
 
-        capabilities = options[:desired_capabilities] || {}
+        capabilities = options[:capabilities] || {}
 
         if options and options[:browser] == :remote
           raise 'Remote driver URL is not specified' unless options[:url]
-          capabilities[:taRemoteUrl] = 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.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
@@ -142,18 +149,30 @@ module TrueAutomation
       end
 
       private
+
+      def opts_browser(opts)
+        opts.class.name.split('::')[2].downcase.to_sym
+      end
+
       def fetch_options(options)
         if options.key?(:options)
-          browser = options[:options].class.name.split('::')[2]
+          browser = opts_browser(options[:options])
           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
+          copy_options(desCaps, 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_preference(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.5.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: true_automation
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.9
 platform: ruby
 authors:
 - TrueAutomation.IO
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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.10
 signing_key:
 specification_version: 4
 summary: TrueAutomation.IO