true_automation 0.3.31 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80ab9c92521f6edf81b4bde9bf529e63e443258483b99de52815372697eb85d9
-  data.tar.gz: 9ce5f945348159a5d947ee705e2d720470342096c4c3fefcf291cb150e3f39b7
+  metadata.gz: 22f6553e2b4a2f3190038a8ad52c2b838bcfb61cae3e86fb963d8492d345b8f2
+  data.tar.gz: 64ca3a87d2bdbb8ac1a180e5691051aa11fa9eb72c02fa00a64e94a361971984
 SHA512:
-  metadata.gz: a3fcb71c16cab882bb8ec5c0b83f1c230717bb1667cd7d0500ed8d6b039a62c43a5e3dcc8135f45b151be965b2cb7f60e8f9631c669c21284635e8c1ce4dcaa2
-  data.tar.gz: e633a3c1ab4c3bc8fb58f3d5d70bf0bba51519204e33e3a3211542b464e7c6c28264b2ab68102718a3723d0abb76af9aa7578794acf1471e29baecff0f75a01e
+  metadata.gz: e26186f0e510de4185f3a60732fa0040d58a820f2d33a92333231cab9fdedfd1a54afffaf5bf3158c62b73c961a19cf3ed6b42efc252a5fa6fb37576f90720f6
+  data.tar.gz: f399dfc5bcc4fab22517db68ba5eecea5ba911b0b31db65a20d5dbd0acdfa168a16fb13553a46e486909974c4e030f196836d480ce67f12b029f59fdddea7383

data/lib/true_automation/client.rb

@@ -8,11 +8,12 @@ module TrueAutomation
     @pid = nil
 
     def start(options)
-
-      @port = options[:port] || 9515
+      @port = options[:port]
       remote = options[:remote]
 
-      if options[:driver]
+      if options[:ta_service]
+        driver_path = " --driver #{options[:ta_service]}"
+      elsif options[:driver]
         driver_path = " --driver #{options[:driver]}"
         driver_path += " --driver-version #{options[:driver_version]}" if options[:driver_version]
       end
@@ -36,12 +37,15 @@ module TrueAutomation
     end
 
     def stop
-      if @pid
-        puts "Stopping TrueAutomation.IO Client with pid #{@pid}"
-        uri = URI("http://localhost:#{@port}/shutdown")
-        Net::HTTP.get(uri)
+      begin
+        if @pid
+          puts "Stopping TrueAutomation.IO Client with pid #{@pid}"
+          uri = URI("http://localhost:#{@port}/shutdown")
+          Net::HTTP.get(uri)
 
-        @pid = nil
+          @pid = nil
+        end
+      rescue
       end
     end
 

data/lib/true_automation/driver/capybara.rb

@@ -25,10 +25,15 @@ module TrueAutomation
   module Driver
     class Capybara < Capybara::Selenium::Driver
       def initialize(app, **options)
-        @port = options.delete(:port) || 9515
+        options = fetch_options(options)
+        @port = options.delete(:port) || find_available_port('localhost')
         @driver = options.delete(:driver)
         @driver_version = options.delete(:driver_version)
 
+        if options[:ta_service]
+          @ta_service = options.delete(:ta_service)
+        end
+
         super(app, options)
 
         @ta_client = TrueAutomation::Client.new
@@ -57,6 +62,7 @@ module TrueAutomation
           @ta_client.start(port: @port,
                            remote: @remote,
                            driver: @driver,
+                           ta_service_path: @ta_service&.executable_path,
                            driver_version: @driver_version)
 
           @ta_client.wait_until_start
@@ -64,7 +70,6 @@ module TrueAutomation
           at_exit do
             @ta_client.stop
           end
-
           super
         end
         @browser
@@ -87,6 +92,26 @@ module TrueAutomation
           super
         end
       end
+
+      private
+      def fetch_options(options)
+        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
+          options.delete(:options)
+        end
+        options
+      end
+
+      def find_available_port(host)
+        server = TCPServer.new(host, rand(9515..65515))
+        server.addr[1]
+      ensure
+        server&.close
+      end
     end
   end
 end

data/lib/true_automation/version.rb

@@ -1,3 +1,3 @@
 module TrueAutomation
-  VERSION = '0.3.31'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: true_automation
 version: !ruby/object:Gem::Version
-  version: 0.3.31
+  version: 0.4.0
 platform: ruby
 authors:
 - TrueAutomation.IO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler