true_automation 0.3.18 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 44ca6e8ad7d27d427c2eb8f9ab88ec47b45c608b
-  data.tar.gz: 61a40e7da600632b06fdb544f313768760dfd003
+SHA256:
+  metadata.gz: bfbcc2e493c1522b04336e00792f54959faa29a725c782d0059a32cf278a10ea
+  data.tar.gz: d981ad6cfdf86e844fdf04df0ce1fd4dc9d318f06076d9d1585a46bdf20dbfdd
 SHA512:
-  metadata.gz: de8b7948f32793100823dd8c12170bcf67da2741ba25a64d87edb93426a29c1f766737f5967d2f46b6c89b4690f45acdc33e8a94c009f730258ec18fac59696b
-  data.tar.gz: 36ce4d0a8613fd5743bc25f53ecd73e9db9ee7ff02c6b78ad8501ec90f4d620da2b11f42c7fa339648f2479ea00196e0c998491d80fa72c6e9f09bf35c7cfce5
+  metadata.gz: 587a9f58f8fd6d32e6ae6f703571c340816108df83a57a90a05708328c9f506673fe16a886c58ea8f1cb88b09751dd2e96a3fbea7b7bfb166be26ffdffa91a23
+  data.tar.gz: bb8a4aaf3cc04a103925ca51c82c2676d5d3b8e770ed0dd674c49c1f2e7b7095ae0c5cc5c79691c3944f8708aa5ee7af0aeedd148b1b61601d80b7f2d91cc39d

data/lib/true_automation/client.rb

@@ -8,11 +8,13 @@ module TrueAutomation
     @pid = nil
 
     def start(options)
-
-      @port = options[:port] || 9515
+      @port = options[:port]
       remote = options[:remote]
+      ta_debug = options[:ta_debug]
 
-      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
@@ -29,19 +31,22 @@ 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}")
+      @pid = spawn("#{@executable} --log-file #{logfile} --port #{@port}#{driver_path}#{remote}#{ta_debug}")
       puts "Started TrueAutomation.IO client with pid #{@pid} listening to port #{@port}"
 
       @pid
     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

@@ -1,4 +1,65 @@
 require_relative '../client'
+module Capybara
+  module Queries
+    class SelectorQuery
+      alias_method :original_description, :description
+      def description(only_applied = false)
+        desc = original_description
+        matched_result = desc.match(/.*__taonly__(.+)__taonly__.*/)
+        if selector = matched_result && matched_result[1]
+          desc = "Element was not found on the page. Element '#{selector}' with such locator is not on this page and could not be detected by TrueAutomation."
+        end
+        matched_result_ta = desc.match(/visible\s(.+)\s\"(.*)__ta__(.+)__ta__.*/)
+        if matched_result_ta && matched_result_ta[3]
+          desc = "Unable to locate element { using: '#{matched_result_ta[1]}', selector: '#{matched_result_ta[2]}' }"
+        end
+        desc
+      end
+    end
+  end
+end
+
+module Capybara
+  module Node
+    module Finders
+      private
+      alias_method :original_synced_resolve, :synced_resolve
+      def synced_resolve(query)
+        begin
+          original_synced_resolve(query)
+        rescue Capybara::ElementNotFound => ex
+          raise Capybara::ElementNotFound, query.applied_description if query.locator.match(/.*__ta(only)*__(.+)__ta(only)*__.*/)
+          raise Capybara::ElementNotFound, ex
+        end
+      end
+    end
+  end
+end
+
+module Capybara
+  module Node
+    class Element < Base
+      def innerHTML=(value)
+        synchronize { base.innerHTML=(value) }
+      end
+    end
+  end
+end
+
+class Capybara::Selenium::Node < Capybara::Driver::Node
+  def innerHTML=(value)
+    driver.evaluate_script SET_INNER_HTML_SCRIPT, self, value
+  end
+
+private
+
+  SET_INNER_HTML_SCRIPT = <<~'JS'
+    (function(el, val){
+      el.innerHTML = val;
+      return;
+    })(arguments[0], arguments[1])
+  JS
+end
 
 module TrueAutomation
   class RecordNotFound < StandardError; end
@@ -6,10 +67,20 @@ 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 && options[:ta_debug]
+          @ta_debug = ' --ta-debug'
+          options.delete(:ta_debug)
+        end
+
+        if options[:ta_service]
+          @ta_service = options.delete(:ta_service)
+        end
+
         super(app, options)
 
         @ta_client = TrueAutomation::Client.new
@@ -18,8 +89,7 @@ module TrueAutomation
         options ||= {}
         ta_url = options[:ta_url] || "http://localhost:#{@port}/"
 
-        capabilities = options[:desired_capabilities]
-        capabilities ||= {}
+        capabilities = options[:desired_capabilities] || {}
 
         if options and options[:browser] == :remote
           raise 'Remote driver URL is not specified' unless options[:url]
@@ -36,39 +106,59 @@ module TrueAutomation
 
       def browser
         unless @browser
-          @ta_client.start(port: @port, remote: @remote, driver: @driver, driver_version: @driver_version)
+          @ta_client.start(port: @port,
+                           remote: @remote,
+                           ta_debug: @ta_debug,
+                           driver: @driver,
+                           ta_service_path: @ta_service&.executable_path,
+                           driver_version: @driver_version)
 
           @ta_client.wait_until_start
 
           at_exit do
             @ta_client.stop
           end
-
           super
         end
         @browser
       end
 
-      def find_css(selector)
-        res = super
-        check_selector(selector) if !res || res.empty?
-        res
+      def quit
+        super
+        @ta_client.stop
       end
 
-      def find_xpath(selector)
-        res = super
-        check_selector(selector) if !res || res.empty?
-        res
+      def specialize_driver(*args)
+        if ::Capybara::Selenium::Driver.respond_to?(:register_specialization)
+          browser_type = browser.browser
+          # Original method uses self.class, and all classes use Capybara::Selenium::Driver.
+          # Thereby no specializations in the list for TA driver class and error occured.
+          ::Capybara::Selenium::Driver.specializations.select { |k, _v| k === browser_type }.each_value do |specialization| # rubocop:disable Style/CaseEquality
+            extend specialization
+          end
+        else
+          super
+        end
       end
 
       private
-
-      def check_selector(selector)
-        if ta_selector_match = selector.match(/__taonly__(.+)__taonly__/)
-          error_text = "Element '#{ta_selector_match[1]}' was not found in database. " +
-                       'Please provide a selector to find and initialize element.'
-          raise TrueAutomation::RecordNotFound, error_text
+      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

data/lib/true_automation/version.rb

@@ -1,3 +1,3 @@
 module TrueAutomation
-  VERSION = '0.3.18'
+  VERSION = '0.5.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: true_automation
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.5.5
 platform: ruby
 authors:
 - TrueAutomation.IO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: TrueAutomation.IO