testa_appium_driver 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42baeaf531486245427c9a3e2bc002e8c6bf659ec2f7e010cc7f46a56c863f2c
-  data.tar.gz: 31ea0d036c32405f744dfdbbce04d596ff3822cd54144270bed08fd4e7e6c90c
+  metadata.gz: c1bc732c1a27c05473fb61ac8c8e6315f4f5349d50b646a99c8d74b0fb8110f5
+  data.tar.gz: 994b66f0f5c32ceabdaddbf9abede544380175ed45e1520026ccebf010f8180c
 SHA512:
-  metadata.gz: 59ac915f5a1036eb9c943c8770295aaa5def6268685f9db2f7b802d9ac19128d39348c4a3cc9010d45fd0fea5f0ced98327f94a124b0eac55cfaff7b310193aa
-  data.tar.gz: aec59ca33a54aed586c832e82a5aa11ca9d331759aea810a89e6e6e0bd9193f48af7b69d6323427413dffba1d3e5bd693d726db4bc88d4f6f3d7439e55bcc00d
+  metadata.gz: a424583a9cac3ea99d507ff72a8c9540a0727fc2402b8c9199528710cce89a6b2f15d627a9e5b29eeae3fa39414fade181a39281a0243c89435fc3ca5e589feb
+  data.tar.gz: ce2a9ba06bd9b56eb95b4d633262ed6a0e9a7e5316a251d2760d84888a03e3dcabdbe2e506ed96db4918e61e9fe069e3478cb14e53584cac4d9e0b3e41dcb45f

data/.gitignore

@@ -13,4 +13,5 @@
 /.idea/deployment.xml
 /.idea/workspace.xml
 /.idea/misc.xml
-testa_appium_driver-*.gem
+testa_appium_driver-*.gem
+appium-driver.iml

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    testa_appium_driver (0.1.131)
-      appium_lib_core (= 5.1.0)
+    testa_appium_driver (0.1.14)
+      appium_lib_core (~> 5.1.0)
       json (~> 2.3)
 
 GEM
@@ -71,4 +71,4 @@ DEPENDENCIES
   testa_appium_driver!
 
 BUNDLED WITH
-   2.1.2
+   2.3.14

data/lib/testa_appium_driver/common/locator.rb

@@ -1,7 +1,7 @@
 require_relative 'locator/scroll_actions'
 
 
-module TestaAppiumDriver
+module ::TestaAppiumDriver
   #noinspection RubyTooManyInstanceVariablesInspection,RubyTooManyMethodsInspection
   class Locator
     include Helpers
@@ -184,13 +184,13 @@ module TestaAppiumDriver
       _wait(:until, args)
     end
 
-
     # all timeouts are disabled before check, and enabled after check
     # @return [boolean] true if it exists in the page regardless if visible or not
     def exists?
       found = true
       begin
-        execute(skip_cache: true, ignore_implicit_wait: true)
+        r = execute(skip_cache: true, ignore_implicit_wait: true)
+        return r.count.positive? if r.is_a?(Array)
       rescue StandardError
         found = false
       end
@@ -303,6 +303,10 @@ module TestaAppiumDriver
       @driver.first_and_last_leaf(execute)
     end
 
+    def first_and_last_child
+      @driver.first_and_last_child(execute)
+    end
+
     def double_click(x = nil, y = nil)
       click(x,y, double: true)
     end

data/lib/testa_appium_driver/common/scroll_actions/w3c_scroll_actions.rb

@@ -84,11 +84,11 @@ module ::TestaAppiumDriver
 
 
 
-
         end
       rescue => e
         raise e
       end
+
       elements
     end
 

data/lib/testa_appium_driver/common/scroll_actions.rb

@@ -1,7 +1,7 @@
 require_relative 'scroll_actions/json_wire_scroll_actions'
 require_relative 'scroll_actions/w3c_scroll_actions'
 
-module TestaAppiumDriver
+module ::TestaAppiumDriver
 
   # Class for handling scroll actions
   class ScrollActions
@@ -221,9 +221,22 @@ module TestaAppiumDriver
 
 
     def is_end_of_scroll?
-      old_elements = @previous_elements
-      @previous_elements = @scrollable.first_and_last_leaf
-      old_elements == @previous_elements
+      if @driver.device == :android
+        # $__ctx.puts "end_of_scroll?"
+        # $__ctx.puts "old: #{@previous_elements}"
+        # $__ctx.puts "device: #{@driver.device}"
+
+        old_elements = @previous_elements
+        @previous_elements = @scrollable.first_and_last_leaf
+        # $__ctx.puts "new: #{@previous_elements}"
+
+        old_elements == @previous_elements
+      else
+        # for is, check location of first and last elements
+        old_elements = @previous_elements
+        @previous_elements = @scrollable.first_and_last_child&.map(&:location)
+        old_elements == @previous_elements
+      end
     end
 
     def default_deadzone!

data/lib/testa_appium_driver/driver.rb

@@ -10,7 +10,7 @@ require_relative 'common/locator'
 require_relative 'common/scroll_actions'
 require_relative 'common/selenium_element'
 
-module TestaAppiumDriver
+module ::TestaAppiumDriver
   class Driver
     include Helpers
 
@@ -300,6 +300,13 @@ module TestaAppiumDriver
       [elements[0], elements[-1]]
     end
 
+    def first_and_last_child(from_element = @driver)
+      elements = from_element.find_elements(xpath: "./*")
+      return nil if elements.count == 0
+
+      [elements[0], elements[-1]]
+    end
+
     private
     def extend_for(device, automation_name)
       case device

data/lib/testa_appium_driver/ios/selenium_element.rb

@@ -2,6 +2,7 @@ module ::Appium
   module Core
     class Element
       include TestaAppiumDriver::TypeSelectors
+      include TestaAppiumDriver::Attributes
     end
   end
 end

data/lib/testa_appium_driver/version.rb

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

data/testa_appium_driver.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "appium_lib_core", ["= 5.1.0"]
+  spec.add_runtime_dependency "appium_lib_core", ["~> 5.2.0"]
   spec.add_runtime_dependency "json", ["~> 2.3"]
 
   spec.add_development_dependency "rubocop", ["= 1.19.0"]

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: testa_appium_driver
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - karlo.razumovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- appium-driver.iml
 - bin/console
 - bin/setup
 - lib/testa_appium_driver.rb

data/appium-driver.iml

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="RVM: ruby-2.7.6" jdkType="RUBY_SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="appium_lib_core (v5.1.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="childprocess (v4.1.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.5.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="eventmachine (v1.2.7, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="faye-websocket (v0.11.1, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v2.6.2, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.22.1, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parser (v3.1.2.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.1.1, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.6, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="regexp_parser (v2.4.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.5, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.11.1, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.26.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.18.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v2.3.2, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="selenium-webdriver (v4.1.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.1.0, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="websocket-driver (v0.7.5, RVM: ruby-2.7.6) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="websocket-extensions (v0.1.5, RVM: ruby-2.7.6) [gem]" level="application" />
-  </component>
-  <component name="RakeTasksCache">
-    <option name="myRootTask">
-      <RakeTaskImpl id="rake">
-        <subtasks>
-          <RakeTaskImpl description="Build testa_appium_driver-0.1.131.gem into the pkg directory" fullCommand="build" id="build" />
-          <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.131.gem into system gems" fullCommand="install" id="install" />
-          <RakeTaskImpl id="install">
-            <subtasks>
-              <RakeTaskImpl description="Build and install testa_appium_driver-0.1.131.gem into system gems without network access" fullCommand="install:local" id="local" />
-            </subtasks>
-          </RakeTaskImpl>
-          <RakeTaskImpl description="Create tag v0.1.131 and build and push testa_appium_driver-0.1.131.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>