From f422e7302dceea2ad424acb584a2a54d29cf7e51 Mon Sep 17 00:00:00 2001 From: chinmay-browserstack <92926953+chinmay-browserstack@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:17:49 +0530 Subject: [PATCH] PoA support for selenium 4 without desired capibilites (#124) --- percy/lib/cache.py | 1 - percy/lib/cli_wrapper.py | 3 +-- percy/lib/percy_automate.py | 1 - percy/metadata/driver_metadata.py | 9 --------- tests/test_driver_metadata.py | 11 ----------- tests/test_screenshot.py | 1 - 6 files changed, 1 insertion(+), 25 deletions(-) diff --git a/percy/lib/cache.py b/percy/lib/cache.py index d263836..417bd0e 100644 --- a/percy/lib/cache.py +++ b/percy/lib/cache.py @@ -11,7 +11,6 @@ class Cache: system_bars = 'system_bars' window_size = 'window_size' viewport = 'viewport' - session_capabilities = 'session_capabilities' capabilities = 'capabilities' command_executor_url = 'command_executor_url' diff --git a/percy/lib/cli_wrapper.py b/percy/lib/cli_wrapper.py index a580066..34423ee 100644 --- a/percy/lib/cli_wrapper.py +++ b/percy/lib/cli_wrapper.py @@ -81,12 +81,11 @@ def post_failed_event(self, error): log(e, on_debug=True) return None - def post_poa_screenshots(self, name, session_id, command_executor_url, capabilities, desired_capabilities, options=None): + def post_poa_screenshots(self, name, session_id, command_executor_url, capabilities, options=None): body = { 'sessionId': session_id, 'commandExecutorUrl': command_executor_url, 'capabilities': dict(capabilities), - 'sessionCapabilites':dict(desired_capabilities), 'snapshotName': name, 'options': options } diff --git a/percy/lib/percy_automate.py b/percy/lib/percy_automate.py index 2d7bee8..7e95ced 100644 --- a/percy/lib/percy_automate.py +++ b/percy/lib/percy_automate.py @@ -47,7 +47,6 @@ def screenshot(self, name: str, **kwargs): metadata.session_id, metadata.command_executor_url, metadata.capabilities, - metadata.session_capabilities, { **options, "ignore_region_elements": ignore_region_elements, "consider_region_elements" : consider_region_elements } ) except Exception as e: diff --git a/percy/metadata/driver_metadata.py b/percy/metadata/driver_metadata.py index 3f07985..59c2ff2 100644 --- a/percy/metadata/driver_metadata.py +++ b/percy/metadata/driver_metadata.py @@ -25,12 +25,3 @@ def capabilities(self): Cache.set_cache(self.session_id, Cache.capabilities, caps) return caps return caps - - @property - def session_capabilities(self): - session_caps = Cache.get_cache(self.session_id, Cache.session_capabilities) - if session_caps is None: - session_caps = dict(self.driver.desired_capabilities) - Cache.set_cache(self.session_id, Cache.session_capabilities, session_caps) - return session_caps - return session_caps diff --git a/tests/test_driver_metadata.py b/tests/test_driver_metadata.py index 2cdf59a..2224a1b 100644 --- a/tests/test_driver_metadata.py +++ b/tests/test_driver_metadata.py @@ -47,14 +47,3 @@ def test_capabilities(self): self.mock_webdriver.capabilities = capabilities self.assertDictEqual(self.metadata.capabilities, capabilities) - - @patch('percy.lib.cache.Cache.CACHE', {}) - def test_session_capabilities(self): - session_capabilities = { - 'platform': 'chrome_android', - 'browserVersion': '115.0.1', - 'session_name': 'abc' - } - - self.mock_webdriver.session_capabilities = session_capabilities - self.assertDictEqual(self.metadata.session_capabilities, session_capabilities) diff --git a/tests/test_screenshot.py b/tests/test_screenshot.py index b43333d..8ea6ced 100644 --- a/tests/test_screenshot.py +++ b/tests/test_screenshot.py @@ -277,7 +277,6 @@ def test_posts_screenshot_poa(self): self.assertEqual(s1['sessionId'], driver.session_id) self.assertEqual(s1['commandExecutorUrl'], driver.command_executor._url) # pylint: disable=W0212 self.assertEqual(s1['capabilities'], dict(driver.capabilities)) - self.assertEqual(s1['sessionCapabilites'], dict(driver.desired_capabilities)) self.assertRegex(s1['client_info'], r'percy-appium-app/\d+') self.assertRegex(s1['environment_info'][0], r'appium/\d+') self.assertRegex(s1['environment_info'][1], r'python/\d+')