From 56617a2f8f41367a535e647a9dc0c6c5423dfec2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 09:01:01 +0000 Subject: [PATCH 1/2] Bump appium-python-client from 3.1.0 to 3.1.1 Bumps [appium-python-client](https://github.com/appium/python-client) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/appium/python-client/releases) - [Changelog](https://github.com/appium/python-client/blob/master/CHANGELOG.rst) - [Commits](https://github.com/appium/python-client/compare/v3.1.0...v3.1.1) --- updated-dependencies: - dependency-name: appium-python-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ae818f7..d748b42 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ build # lib pytest==7.4.3 -Appium-Python-Client==3.1.0 +Appium-Python-Client==3.1.1 selenium==4.16.0 opencv-python==4.8.1.78 geckodriver-autoinstaller==0.1.0 diff --git a/setup.py b/setup.py index 61365a1..58ca99b 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ python_requires=">=3.6, <4", install_requires=[ "pytest==7.4.3", - "Appium-Python-Client==3.1.0", + "Appium-Python-Client==3.1.1", "selenium==4.16.0", "opencv-python==4.8.1.78", "geckodriver-autoinstaller==0.1.0", From 6e29ad93ef3e8023d18fc79b0c54a91f529162b7 Mon Sep 17 00:00:00 2001 From: Alvaro Laserna Date: Mon, 19 Feb 2024 14:17:47 +0200 Subject: [PATCH 2/2] fix tests for android --- tests/appium_tests.py | 5 +++-- testui/support/appium_driver.py | 2 +- testui/support/testui_driver.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/appium_tests.py b/tests/appium_tests.py index 94ed6ac..03bfac1 100644 --- a/tests/appium_tests.py +++ b/tests/appium_tests.py @@ -34,9 +34,10 @@ def test_screenshot_methods(self, selenium_driver: TestUIDriver): "./resources/comp.png", fps_reduction=30, keep_image_as="./logs/v-image.png", + threshold=0.6 ) selenium_driver.find_image_match( - "./resources/comp.png", 0.9, True, image_match="./logs/image.png" + "./resources/comp.png", 0.6, True, image_match="./logs/image.png" ) - selenium_driver.click_by_image("./resources/comp.png") + selenium_driver.click_by_image("./resources/comp.png", threshold=0.6) selenium_driver.raise_errors() diff --git a/testui/support/appium_driver.py b/testui/support/appium_driver.py index 3a6417f..f4a64bf 100644 --- a/testui/support/appium_driver.py +++ b/testui/support/appium_driver.py @@ -256,7 +256,7 @@ def set_chrome_driver(self, version="") -> "NewDriver": mobile_version = check_chrome_version(self.udid) logger.log(f"Installing chromedriver version: {mobile_version}") chrome_driver = chrome.ChromeDriverManager( - version=mobile_version + driver_version=mobile_version ).install() logger.log(f"Driver installed in {chrome_driver}", True) self.__desired_capabilities["chromedriverExecutable"] = chrome_driver diff --git a/testui/support/testui_driver.py b/testui/support/testui_driver.py index 90add5c..fcc1504 100644 --- a/testui/support/testui_driver.py +++ b/testui/support/testui_driver.py @@ -275,7 +275,7 @@ def click_by_image(self, image: str, threshold=0.9, webview=False): ta.tap(x=x, y=y).perform() logger.log( f"{self.device_name}: element with image {image}" - "clicked on point ({x},{y})" + f"clicked on point ({x},{y})" ) self.__delete_screenshot(im_path)