testa_appium_driver 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57c9443d16200ae583fc1d8a4cae4b27890566bfd0cd919dc7aae5b7e9f371f9
-  data.tar.gz: 4fd4ec8bd0b7bb3f0f9ccea250873878e17553ef06993d7f11d8c03db224a065
+  metadata.gz: eb79ce18b9e98f651e83630eff7efe2d71d77031231f88c04521e7d4f1baf483
+  data.tar.gz: 94d1b8a88844c8726b1b87cd500ca07842b7b92190df7ef223f2cac4f929c9d9
 SHA512:
-  metadata.gz: abadbdf89242733883b65c781d2b6875a7a373f5667a7aab7ba4c77bd13bacc4069d7a9ac031d3cc541bc292c9dd48e5bf520dff9dcbb996b8abe6bc5e565e1a
-  data.tar.gz: 221a32b22c15d0ee23a75cb65fb61862700ff176c13a8fd573878a83896f65f518401a768218b3460fcaef12dc32780199a0e96fa718f07c3a8ac9d43087f0a4
+  metadata.gz: 9c2abf9c966c5e8d192c52e48226fcf0d73994315b3d865e48ce03f41aced48f3785dcaf7d46fd26b6e21fa51e0035cae6b00e416fffde3ae1ab0a5cf703b982
+  data.tar.gz: e7e087b4b4227eb4d355df738f53d4ea72903b80fe51d3408c8c7ec6ac855a2066f40882dbae55de3418a1827895bcbefa14aa9b3322d767e22cd94393c1a67c

data/.idea/deployment.xml

@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData">
+  <component name="PublishConfigData" autoUpload="On explicit save action" serverName="supertesta.com" autoUploadExternalChanges="true">
     <serverData>
       <paths name="supertesta.com">
         <serverdata>
           <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
+            <mapping deploy="/testa_docker/path_data/testa_appium_driver" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="testa.fun">
+        <serverdata>
+          <mappings>
+            <mapping deploy="/testa_docker/path_data/testa_appium_driver" local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>
     </serverData>
+    <option name="myAutoUpload" value="ON_EXPLICIT_SAVE" />
   </component>
 </project>

data/.idea/sshConfigs.xml

@@ -5,6 +5,9 @@
       <sshConfig authType="PASSWORD" host="supertesta.com" id="ea45cb27-d516-4292-a1f7-430f02857685" port="22" customName="Supertesta.com" nameFormat="CUSTOM" username="testa">
         <option name="customName" value="Supertesta.com" />
       </sshConfig>
+      <sshConfig authType="PASSWORD" host="testa.fun" id="54640192-a130-4edc-ac3c-f3bc32df1130" port="22" customName="testa.fun" nameFormat="CUSTOM" username="root">
+        <option name="customName" value="testa.fun" />
+      </sshConfig>
     </configs>
   </component>
 </project>

data/.idea/webServers.xml

@@ -9,6 +9,13 @@
           </advancedOptions>
         </fileTransfer>
       </webServer>
+      <webServer id="e1897dc5-c089-49e3-802d-1c69de9874a7" name="testa.fun" url="http://something">
+        <fileTransfer rootFolder="/ruby_apps" accessType="SFTP" host="testa.fun" port="22" sshConfigId="54640192-a130-4edc-ac3c-f3bc32df1130" sshConfig="testa.fun">
+          <advancedOptions>
+            <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
+          </advancedOptions>
+        </fileTransfer>
+      </webServer>
     </option>
   </component>
 </project>

data/lib/testa_appium_driver/android/locator.rb

@@ -36,15 +36,19 @@ module TestaAppiumDriver
 
 
     # resolve selector which will be used for finding element
-    def strategy_and_selector
+    def strategies_and_selectors
+      ss = []
       if @can_use_id_strategy
-        return FIND_STRATEGY_ID, @can_use_id_strategy
+        ss.push({"#{FIND_STRATEGY_ID}": @can_use_id_strategy})
       end
-      if (@strategy.nil? && @default_find_strategy == FIND_STRATEGY_UIAUTOMATOR) || @strategy == FIND_STRATEGY_UIAUTOMATOR
-        [FIND_STRATEGY_UIAUTOMATOR, ui_selector]
-      elsif (@strategy.nil? && @default_find_strategy == FIND_STRATEGY_XPATH) || @strategy == FIND_STRATEGY_XPATH
-        [FIND_STRATEGY_XPATH, @xpath_selector]
+      if @strategy.nil? || @strategy == FIND_STRATEGY_UIAUTOMATOR
+        ss.push({"#{FIND_STRATEGY_UIAUTOMATOR}": ui_selector})
       end
+
+      if @strategy.nil? || @strategy == FIND_STRATEGY_XPATH
+        ss.push({"#{FIND_STRATEGY_XPATH}": @xpath_selector})
+      end
+      ss
     end
 
 

data/lib/testa_appium_driver/common/locator.rb

@@ -25,6 +25,8 @@ module TestaAppiumDriver
     attr_accessor :default_find_strategy
     attr_accessor :default_scroll_strategy
 
+    attr_accessor :index_for_multiple
+
 
     # locator parameters are:
     #   single: true or false
@@ -38,6 +40,7 @@ module TestaAppiumDriver
     def initialize(driver, from_element, params = {})
       # @type [TestaAppiumDriver::Driver]
       @driver = driver
+      @index_for_multiple = nil
 
       params, selectors = extract_selectors_from_params(params)
       single = params[:single]
@@ -57,7 +60,8 @@ module TestaAppiumDriver
       @default_find_strategy = params[:default_find_strategy]
       @default_scroll_strategy = params[:default_scroll_strategy]
 
-      @can_use_id_strategy = selectors.keys.count == 1 && !selectors[:id].nil?
+
+      @can_use_id_strategy = is_only_id_selector?(selectors)
       if @can_use_id_strategy
         if @driver.device == :android
           @can_use_id_strategy = resolve_id(selectors[:id])
@@ -76,10 +80,22 @@ module TestaAppiumDriver
     end
 
 
+    def is_only_id_selector?(selectors)
+      # since, name and id is the same thing for iOS,
+      if @driver.device == :android
+        selectors.keys.count == 1 && !selectors[:id].nil?
+      else
+        # if it iOS we assign the name to id
+        selectors.keys.count == 2 && !selectors[:id].nil? && selectors[:id] == selectors[:name]
+      end
+    end
+
+
     # method missing is used to fetch the element before executing additional commands like click, send_key, count
     def method_missing(method, *args, &block)
       r = execute.send(method, *args, &block)
       @driver.invalidate_cache
+      r = r[@index_for_multiple] if !@index_for_multiple.nil? && !@single
       r
     end
 
@@ -100,10 +116,12 @@ module TestaAppiumDriver
 
 
 
-      strategy, selector = strategy_and_selector
 
 
-      @driver.execute(@from_element, selector, @single, strategy, @default_find_strategy, skip_cache)
+
+      r = @driver.execute(@from_element, @single, strategies_and_selectors, skip_cache)
+      r = r[@index_for_multiple] if !@index_for_multiple.nil? && !@single
+      r
     end
 
 
@@ -111,12 +129,8 @@ module TestaAppiumDriver
     # @return [TestaAppiumDriver::Locator]
     def wait_until_exists(timeout = nil)
       timeout = @driver.get_timeouts["implicit"] / 1000 if timeout.nil?
-      start_time = Time.now.to_f
-      until exists?
-        raise "wait until exists timeout exceeded" if start_time + timeout < Time.now.to_f
-        sleep EXISTS_WAIT
-      end
-      self
+      args = {timeout: timeout}
+      _wait(:until, args)
     end
 
 
@@ -124,12 +138,19 @@ module TestaAppiumDriver
     # @return [TestaAppiumDriver::Locator]
     def wait_while_exists(timeout = nil)
       timeout = @driver.get_timeouts["implicit"] / 1000 if timeout.nil?
-      start_time = Time.now.to_f
-      while exists?
-        raise "wait until exists timeout exceeded" if start_time + timeout < Time.now.to_f
-        sleep EXISTS_WAIT
-      end
-      self
+      args = {timeout: timeout}
+      _wait(:while, args)
+    end
+
+
+    def wait_while(timeout = nil, args = {})
+      args[:timeout] = timeout
+      _wait(:while, args)
+    end
+
+    def wait_until(timeout = nil, args = {})
+      args[:timeout] = timeout
+      _wait(:until, args)
     end
 
 
@@ -179,7 +200,7 @@ module TestaAppiumDriver
         locator.can_use_id_strategy = false
         locator
       else
-        from_element = self.execute[instance]
+        from_element = self.index_for_multiple = instance
         params = {}.merge({single: true, scrollable_locator: @scrollable_locator})
         #params[:strategy] = FIND_STRATEGY_XPATH
         #params[:strategy_reason] = "retrieved instance of a array"
@@ -216,7 +237,8 @@ module TestaAppiumDriver
           xpath: @xpath_selector,
           scrollable: @scrollable_locator.nil? ? nil : @scrollable_locator.to_s,
           scroll_orientation: @scroll_orientation,
-          resolved: strategy_and_selector
+          resolved: strategies_and_selectors,
+          index_for_multiple: @index_for_multiple
       }
     end
 
@@ -401,6 +423,51 @@ module TestaAppiumDriver
 
     private
 
+    def _wait(type, args)
+      interval = EXISTS_WAIT
+      interval = args[:interval] unless args[:interval].nil?
+
+      message = "wait #{type} exists timeout exceeded"
+      message = args[:message] unless args[:message].nil?
+
+      if args[:timeout].nil?
+        timeout = @driver.get_timeouts["implicit"] / 1000
+      else
+        timeout = args[:timeout]
+      end
+
+      args.delete(:message)
+      args.delete(:interval)
+      args.delete(:timeout)
+
+
+
+      start_time = Time.now.to_f
+      if type ==  :while
+        while exists? && _attributes_match(args)
+          raise message if start_time + timeout < Time.now.to_f
+          sleep interval
+        end
+      else
+        until exists? && _attributes_match(args)
+          raise message if start_time + timeout < Time.now.to_f
+          sleep interval
+        end
+      end
+      self
+    end
+
+    def _attributes_match(attributes)
+      all_match = true
+      attributes.each do |key, value|
+        unless attribute(key) == value
+          all_match = false
+          break
+        end
+      end
+      all_match
+    end
+
     #noinspection RubyNilAnalysis
     def perform_driver_method(name, *args)
       elements = execute

data/lib/testa_appium_driver/driver.rb

@@ -63,42 +63,46 @@ module TestaAppiumDriver
     # Cache stores last executed find_element with given selector, strategy and from_element. If given values are the same within
     # last 5 seconds element is retrieved from cache.
     # @param [TestaAppiumDriver::Locator, TestaAppiumDriver::Driver] from_element element from which start the search
-    # @param [String] selector resolved string of a [TestaAppiumDriver::Locator] selector xpath for xpath strategy, java UiSelectors for uiautomator or id for ID strategy
     # @param [Boolean] single fetch single or multiple results
-    # @param [Symbol, nil] strategy [TestaAppiumDriver::FIND_STRATEGY_UIAUTOMATOR], [TestaAppiumDriver::FIND_STRATEGY_XPATH] or [TestaAppiumDriver::FIND_STRATEGY_ID]
-    # @param [Symbol] default_strategy if strategy is not enforced, default can be used
+    # @param [Array<Hash>] strategies_and_selectors array of usable strategies and selectors
     # @param [Boolean] skip_cache to skip checking and storing cache
     # @return [Selenium::WebDriver::Element, Array] element is returned if single is true, array otherwise
-    def execute(from_element, selector, single, strategy, default_strategy, skip_cache = false)
+    def execute(from_element, single, strategies_and_selectors, skip_cache = false)
 
       # if user wants to wait for element to exist, he can use wait_until_present
       disable_wait_for_idle
+      disable_implicit_wait
+      start_time = Time.now.to_f
+      ss_index = 0
+
 
 
-      # if not restricted to a strategy, use the default one
-      strategy = default_strategy if strategy.nil?
 
       # resolve from_element unique id, so that we can cache it properly
       from_element_id = from_element.kind_of?(TestaAppiumDriver::Locator) ? from_element.strategy_and_selector[1] : nil
 
-      puts "Executing #{from_element_id ? "from #{from_element.strategy}: #{from_element.strategy_and_selector} => " : ""}#{strategy}: #{selector}"
       begin
-        if @cache[:selector] != selector || # cache miss, selector is different
+        ss = strategies_and_selectors[ss_index % strategies_and_selectors.count]
+        ss_index +=1
+
+        puts "Executing #{from_element_id ? "from #{from_element.strategy}: #{from_element.strategy_and_selector} => " : ""}#{ss.keys[0]}: #{ss.values[0]}"
+
+        if @cache[:selector] != ss.values[0] || # cache miss, selector is different
             @cache[:time] + 5 <= Time.now || # cache miss, older than 5 seconds
-            @cache[:strategy] != strategy || # cache miss, different find strategy
+            @cache[:strategy] != ss.keys[0] || # cache miss, different find strategy
             @cache[:from_element_id] != from_element_id || # cache miss, search is started from different element
             skip_cache # cache is skipped
 
           if single
-            execute_result = from_element.find_element("#{strategy}": selector)
+            execute_result = from_element.find_element(ss)
           else
-            execute_result = from_element.find_elements("#{strategy}": selector)
+            execute_result = from_element.find_elements(ss)
           end
 
 
           unless skip_cache
-            @cache[:selector] = selector
-            @cache[:strategy] = strategy
+            @cache[:selector] = ss.values[0]
+            @cache[:strategy] = ss.keys[0]
             @cache[:time] = Time.now
             @cache[:from_element_id] = from_element_id
             @cache[:element] = execute_result
@@ -109,8 +113,14 @@ module TestaAppiumDriver
           puts "Using cache from #{@cache[:time].strftime("%H:%M:%S.%L")}, strategy: #{@cache[:strategy]}"
         end
       rescue => e
-        raise e
+        if start_time + @implicit_wait_ms/1000 < Time.now.to_f || ss_index < strategies_and_selectors.count
+          sleep EXISTS_WAIT if ss_index >= strategies_and_selectors.count
+          retry
+        else
+          raise e
+        end
       ensure
+        enable_implicit_wait
         enable_wait_for_idle
       end
 
@@ -121,9 +131,8 @@ module TestaAppiumDriver
     # method missing is used to forward methods to the actual appium driver
     # after the method is executed, find element cache is invalidated
     def method_missing(method, *args, &block)
-      r = @driver.send(method, *args, &block)
       invalidate_cache
-      r
+      @driver.send(method, *args, &block)
     end
 
     # disables implicit wait

data/lib/testa_appium_driver/ios/locator.rb

@@ -24,11 +24,13 @@ module TestaAppiumDriver
 
 
     # @return [Array] returns 2 elements. The first is the resolved find element strategy and the second is the resolved selector
-    def strategy_and_selector
+    def strategies_and_selectors
+      ss = []
       if @can_use_id_strategy
-        return FIND_STRATEGY_NAME, @can_use_id_strategy
+        ss.push({"#{FIND_STRATEGY_NAME}": @can_use_id_strategy})
       end
-      [FIND_STRATEGY_XPATH, @xpath_selector]
+      ss.push({"#{FIND_STRATEGY_XPATH}": @xpath_selector})
+      ss
     end
 
 

data/lib/testa_appium_driver/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestaAppiumDriver
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/testa_appium_driver.iml

@@ -11,12 +11,12 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="appium_lib_core (v4.7.0, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, ruby-2.6.5-p114) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, ruby-2.6.5-p114) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.2.24, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="childprocess (v3.0.0, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.4.4, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="eventmachine (v1.2.7, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="faye-websocket (v0.11.1, ruby-2.6.5-p114) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v2.1.0, ruby-2.6.5-p114) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v2.5.1, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parallel (v1.20.1, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parser (v3.0.2.0, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, ruby-2.6.5-p114) [gem]" level="application" />
@@ -28,8 +28,8 @@
     <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.10.1, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.10.2, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.10.2, ruby-2.6.5-p114) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.19.0, ruby-2.6.5-p114) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.10.0, ruby-2.6.5-p114) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.20.0, ruby-2.6.5-p114) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.11.0, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.11.0, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubyzip (v2.3.2, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="selenium-webdriver (v3.142.7, ruby-2.6.5-p114) [gem]" level="application" />
@@ -39,7 +39,41 @@
   </component>
   <component name="RakeTasksCache">
     <option name="myRootTask">
-      <RakeTaskImpl id="rake" />
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build testa_appium_driver-0.1.5.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl id="build">
+            <subtasks>
+              <RakeTaskImpl description="Generate SHA512 checksum if testa_appium_driver-0.1.5.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
+          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
+          <RakeTaskImpl description="Build and install testa_appium_driver-0.1.5.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install testa_appium_driver-0.1.5.gem into system gems without network access" fullCommand="install:local" id="local" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Create tag v0.1.5 and build and push testa_appium_driver-0.1.5.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run RuboCop" fullCommand="rubocop" id="rubocop" />
+          <RakeTaskImpl id="rubocop">
+            <subtasks>
+              <RakeTaskImpl description="Auto-correct RuboCop offenses" fullCommand="rubocop:auto_correct" id="auto_correct" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Run RSpec code examples" fullCommand="spec" id="spec" />
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
     </option>
   </component>
 </module>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testa_appium_driver
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - karlo.razumovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib_core