true_automation 0.5.5 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfbcc2e493c1522b04336e00792f54959faa29a725c782d0059a32cf278a10ea
-  data.tar.gz: d981ad6cfdf86e844fdf04df0ce1fd4dc9d318f06076d9d1585a46bdf20dbfdd
+  metadata.gz: 5899752657a55d787cd0d34e450485baa81ccd00fcb04b39299646dd016404de
+  data.tar.gz: 961a54b9115cc568ec44cfafbc9cb5c530a0d9126a3c3cfcfb0efd6efca81eda
 SHA512:
-  metadata.gz: 587a9f58f8fd6d32e6ae6f703571c340816108df83a57a90a05708328c9f506673fe16a886c58ea8f1cb88b09751dd2e96a3fbea7b7bfb166be26ffdffa91a23
-  data.tar.gz: bb8a4aaf3cc04a103925ca51c82c2676d5d3b8e770ed0dd674c49c1f2e7b7095ae0c5cc5c79691c3944f8708aa5ee7af0aeedd148b1b61601d80b7f2d91cc39d
+  metadata.gz: '0966514008a28ac8a073065c605b63c41d248159279560042da26459ade761fbed733fe31710a174d9e9450cd335e8ea934cfa8d20776b03a2084cb7984aab58'
+  data.tar.gz: 81eb2f5120ec29af5bc8be0ca2794fd1a947d0a138a192dbe5a16626db5fe3489e6c03a57923ac8037a3a85b2d26c75e6d7a43331e9224350cf99c086dfcb75a

data/lib/true_automation/driver/appium_lib.rb

@@ -0,0 +1,27 @@
+require_relative '../client'
+
+module TrueAutomation
+  module Driver
+    class AppiumLib < Appium::Core::Driver
+      def initialize(*args)
+        @ta_client = TrueAutomation::Client.new
+        @remote = ''
+        super
+      end
+
+      def start_driver(*args)
+        @ta_client.start(port: @port,
+                         remote: @remote,
+                         ta_debug: @ta_debug,
+                         driver: 'appium')
+
+        @ta_client.wait_until_start
+
+        at_exit do
+          @ta_client.stop
+        end
+        super
+      end
+    end
+  end
+end

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.5'
+  VERSION = '0.5.9'
 end

data/true_automation.gemspec

@@ -25,8 +25,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.4'
   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'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: true_automation
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.9
 platform: ruby
 authors:
 - TrueAutomation.IO
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: appium_lib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+- !ruby/object:Gem::Dependency
+  name: appium_lib_core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 description: "  true_automation gem enables awesome TrueAutomation.IO features for
   Capybara and Watir projects.\n"
 email:
@@ -83,6 +111,7 @@ files:
 - bin/setup
 - lib/true_automation.rb
 - lib/true_automation/client.rb
+- lib/true_automation/driver/appium_lib.rb
 - lib/true_automation/driver/capybara.rb
 - lib/true_automation/dsl.rb
 - lib/true_automation/helpers.rb
@@ -93,7 +122,7 @@ homepage: http://trueautomation.io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: TrueAutomation.IO
 test_files: []