percy-appium-app 0.0.9.beta0 → 0.0.9.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4c4c4f66c3a7ecfe019e07eef6a8dfdffd17d57935c12780b441388703a5af
-  data.tar.gz: 7ee0cd5c07b82d25a5718894fee9891bc612c02ed665cb34cf7f1e46d1fa95d1
+  metadata.gz: c6f74600a42302bf5300a766e19c17ebdd04b7458ce55f8685acf7f674f96e43
+  data.tar.gz: 9b4442060ca02d391eb2ee5863989f0736dabe38e58fa0d4b83e43c51af042e7
 SHA512:
-  metadata.gz: a6e82f7ada4e367c5e74f24a8e9652619b581c3ec00076212ffbeced9e3f203928ad77cf067d0be3270fee228c734963bfbbf8ac5a3c0e6e9d7ad3fe6041aeed
-  data.tar.gz: f991caac478c3035ae723faf96fb0cc0010631de9832eb5976e6beb325861c52aaf5caa6db658e9d716fcfea2fd9199203fd15c894028e7526b79b8bfd107c11
+  metadata.gz: 25b974f6c6de47ec6ecf38547296cbc280ca85a24b356b907fce4db8d416588197d786fddd38df5ec2297e26b28a42eb0aebaed6c6a8591f379f3f9c5d84fe71
+  data.tar.gz: 40e6e18819248f11358abd3aa2b0047cfda9062a9519858aad2eeb7a36d92809763bc46f6f68bf0f2dd830b9c33c36bbca2cd0e59aeba10483dbc46713e85e0e

data/.github/workflows/Semgrep.yml

@@ -27,8 +27,7 @@ jobs:
 
     container:
       # A Docker image with Semgrep installed. Do not change this.
-      image: returntocorp/semgrep
-
+      image: returntocorp/semgrep:1.166.0
     # Skip any PR created by dependabot to avoid permission issues:
     if: (github.actor != 'dependabot[bot]')
 

data/percy/metadata/android_metadata.rb

@@ -15,12 +15,15 @@ module Percy
     def device_screen_size
       caps = capabilities
       caps = caps.as_json unless caps.is_a?(Hash)
+      # Use string keys to match the IosMetadata implementation and every
+      # consumer (generic_provider, app_automate, _get_tag), all of which read
+      # device_screen_size['width'] / ['height'].
       if caps['deviceScreenSize'].nil?
         size = driver.window_size
-        { width: size.width.to_i, height: size.height.to_i }
+        { 'width' => size.width.to_i, 'height' => size.height.to_i }
       else
         width, height = caps['deviceScreenSize'].split('x')
-        { width: width.to_i, height: height.to_i }
+        { 'width' => width.to_i, 'height' => height.to_i }
       end
     end
 

data/percy/metadata/metadata_resolver.rb

@@ -9,7 +9,8 @@ module Percy
     def self.resolve(driver)
       capabilities = driver.capabilities
       capabilities = capabilities.as_json unless capabilities.is_a?(Hash)
-      platform_name = capabilities.fetch('platformName', '').downcase
+      key = capabilities.keys.find { |k| k.downcase.gsub('_', '') == 'platformname' }
+      platform_name = capabilities[key]&.downcase
       case platform_name
       when 'android'
         Percy::AndroidMetadata.new(driver)

data/percy/providers/generic_provider.rb

@@ -137,7 +137,10 @@ module Percy
 
     def get_regions_by_xpath(elements_array, xpaths)
       xpaths.each do |xpath|
-        element = driver.find_element(Appium::Core::Base::SearchContext::FINDERS[:xpath], xpath)
+        # Pass the :xpath finder symbol directly. appium_lib_core 12.x removed
+        # Appium::Core::Base::SearchContext::FINDERS; the symbol form works
+        # across all supported appium_lib versions.
+        element = driver.find_element(:xpath, xpath)
         selector = "xpath: #{xpath}"
         if element
           region = get_region_object(selector, element)

data/percy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Percy
-  VERSION = '0.0.9.beta0'.freeze
+  VERSION = '0.0.9.beta.2'.freeze
 end

data/specs/android_metadata.rb

@@ -46,13 +46,21 @@ class TestAndroidMetadata < Minitest::Test
 
     # Call the method and assert the result
     result = @android_metadata.device_screen_size
-    assert_equal({ width: 1080, height: 1920 }, result)
+    assert_equal({ 'width' => 1080, 'height' => 1920 }, result)
 
     # Verify mocks
     mock_window_size.verify
     @mock_webdriver.verify
   end
 
+  def test_device_screen_size_when_device_screen_size_is_present
+    # 'deviceScreenSize' => '1080x2280' from get_android_capabilities; parsed into string-keyed hash
+    @mock_webdriver.expect(:capabilities, get_android_capabilities)
+    result = @android_metadata.device_screen_size
+    assert_equal({ 'width' => 1080, 'height' => 2280 }, result)
+    @mock_webdriver.verify
+  end
+
   def test_get_system_bars
     system_bars = {
       'statusBar' => { 'height' => 83 },

data/specs/app_automate.rb

@@ -67,9 +67,12 @@ class TestAppAutomate < Minitest::Test
   end
 
   def test_execute_percy_screenshot_end
-    @app_automate.stub(:execute_percy_screenshot_begin, 'deviceName' => 'abc', 'osVersion' => '123') do
+    # Wrap the stub return hashes in explicit braces. Under Ruby 3 keyword
+    # argument separation, a bare trailing hash is otherwise parsed as keyword
+    # args to Minitest's stub, raising ArgumentError.
+    @app_automate.stub(:execute_percy_screenshot_begin, { 'deviceName' => 'abc', 'osVersion' => '123' }) do
       @app_automate.stub(:execute_percy_screenshot_end, nil) do
-        @app_automate.stub(:screenshot, 'link' => 'https://link') do
+        @app_automate.stub(:screenshot, { 'link' => 'https://link' }) do
           @app_automate.screenshot('name')
         end
       end

data/specs/generic_providers.rb

@@ -256,7 +256,7 @@ class TestGenericProvider < Minitest::Test
     end
 
     @mock_webdriver.expect(:find_element, mock_element,
-                           [Appium::Core::Base::SearchContext::FINDERS[:xpath], '//path/to/element'])
+                           [:xpath, '//path/to/element'])
 
     elements_array = []
     xpaths = ['//path/to/element']
@@ -271,7 +271,7 @@ class TestGenericProvider < Minitest::Test
   end
 
   def test_get_regions_by_xpath_with_non_existing_element
-    @mock_webdriver.expect(:find_element, [Appium::Core::Base::SearchContext::FINDERS[:xpath], '//path/to/element']) do
+    @mock_webdriver.expect(:find_element, [:xpath, '//path/to/element']) do
       raise Appium::Core::Error::NoSuchElementError, 'Test error'
     end
     elements_array = []
@@ -309,7 +309,7 @@ class TestGenericProvider < Minitest::Test
       mock_element.expect(:size, Selenium::WebDriver::Dimension.new(100, 200))
     end
 
-    @mock_webdriver.expect(:find_element, [Appium::Core::Base::SearchContext::FINDERS[:accessibility_id], 'id1']) do
+    @mock_webdriver.expect(:find_element, [:accessibility_id, 'id1']) do
       raise Appium::Core::Error::NoSuchElementError, 'Test error'
     end
 

data/specs/metadata_resolver.rb

@@ -20,6 +20,24 @@ class MetadataResolverTestCase < Minitest::Test
     assert_instance_of(Percy::AndroidMetadata, resolved_metadata)
     @mock_webdriver.verify
   end
+  
+  def test_android_resolved_with_PLATFORM_NAME
+    @mock_webdriver.expect(:capabilities, { 'PLATFORM_NAME' => 'Android' })
+    @mock_webdriver.expect(:capabilities, { 'PLATFORM_NAME' => 'Android' })
+    resolved_metadata = Percy::MetadataResolver.resolve(@mock_webdriver)
+
+    assert_instance_of(Percy::AndroidMetadata, resolved_metadata)
+    @mock_webdriver.verify
+  end
+
+  def test_android_resolved_with_platform_name
+    @mock_webdriver.expect(:capabilities, { 'platform_name' => 'Android' })
+    @mock_webdriver.expect(:capabilities, { 'platform_name' => 'Android' })
+    resolved_metadata = Percy::MetadataResolver.resolve(@mock_webdriver)
+
+    assert_instance_of(Percy::AndroidMetadata, resolved_metadata)
+    @mock_webdriver.verify
+  end
 
   def test_ios_resolved
     @mock_webdriver.expect(:capabilities, { 'platformName' => 'iOS' })
@@ -29,6 +47,23 @@ class MetadataResolverTestCase < Minitest::Test
     @mock_webdriver.verify
   end
 
+  def test_ios_resolved_with_platform_name
+    @mock_webdriver.expect(:capabilities, { 'platform_name' => 'iOS' })
+    resolved_metadata = Percy::MetadataResolver.resolve(@mock_webdriver)
+
+    assert_instance_of(Percy::IOSMetadata, resolved_metadata)
+    @mock_webdriver.verify
+  end
+
+  def test_platformName_precedence_over_platform_name
+    @mock_webdriver.expect(:capabilities, { 'platformName' => 'Android', 'platform_name' => 'iOS' })
+    @mock_webdriver.expect(:capabilities, { 'platformName' => 'Android', 'platform_name' => 'iOS' })
+    resolved_metadata = Percy::MetadataResolver.resolve(@mock_webdriver)
+
+    assert_instance_of(Percy::AndroidMetadata, resolved_metadata)
+    @mock_webdriver.verify
+  end
+
   def test_unknown_platform_exception
     @mock_webdriver.expect(:capabilities, { 'platformName' => 'Something Random' })
 
@@ -38,4 +73,14 @@ class MetadataResolverTestCase < Minitest::Test
 
     @mock_webdriver.verify
   end
+
+  def test_unknown_platform_exception_with_platform_name
+    @mock_webdriver.expect(:capabilities, { 'platform_name' => 'Something Random' })
+
+    assert_raises(PlatformNotSupported) do
+      Percy::MetadataResolver.resolve(@mock_webdriver)
+    end
+
+    @mock_webdriver.verify
+  end
 end

data/specs/screenshot.rb

@@ -383,7 +383,7 @@ class TestPercyScreenshot < Minitest::Test
                     })
     end
     driver.expect(:find_element, mock_element,
-                  [Appium::Core::Base::SearchContext::FINDERS[:xpath], '//path/to/element'])
+                  [:xpath, '//path/to/element'])
 
     percy_screenshot(driver, 'screenshot 1', ignore_regions_xpaths: xpaths)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percy-appium-app
 version: !ruby/object:Gem::Version
-  version: 0.0.9.beta0
+  version: 0.0.9.beta.2
 platform: ruby
 authors:
 - BroswerStack
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Percy visual testing for Ruby Appium Mobile Apps
 test_files: []