Bugfix trello 2583 layout is skewed off coded selector (#351)

Igor Kozyrenko · web-flow · commit a6d76022850e · 2021-06-01T19:38:38.000+03:00
* docs: update CHANGELOG.md
* fix: offset subscreenshot's frame_location_in_screenshot by original screenshot scroll position
* refactor: set APPLITOOLS_BATCH_NAME in travis.yml
* test: add test_layout_region_calculation_within_frame
* test: avoid using deprecated abort_if_not_closed
* test: bump appium and ios version in generated tests to avoid saucelabs crashes.
* test: pass PYTHON variables to tests in tox
diff --git a/.travis.yml b/.travis.yml
@@ -150,6 +150,7 @@ jobs:
               - TOX_ENV=selenium-generated
               - TEST_PLATFORM=Linux
               - TEST_BROWSERS=chrome
+              - APPLITOOLS_BATCH_NAME="Python Coverage Tests"
           before_install:
               - git submodule update --init --remote --recursive
               - nvm install node
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [vNext]
+### Fixed
+- Layout is skewed off coded selector [Trello 2583](https://trello.com/c/wxtUJtI5)
+
 ## [4.21.0] - 2021-05-28
 ### Added
 - Allow Python Proxy via ProxySettings object [Trello 1583](https://trello.com/c/qQAooLih)
diff --git a/coverage-tests/test/conftest.py b/coverage-tests/test/conftest.py
@@ -78,7 +78,7 @@ def android_desired_capabilities(request, dev, app):
     desired_caps["automationName"] = "UiAutomator2"
     desired_caps["name"] = "AndroidNativeApp checkWindow"
     desired_caps["deviceOrientation"] = "portrait"
-    desired_caps["appiumVersion"] = "1.13.0"
+    desired_caps["appiumVersion"] = "1.19.2"
     return desired_caps
 
 
@@ -89,14 +89,14 @@ def ios_desired_capabilities(request, dev, app):
     desired_caps["NATIVE_APP"] = True
     desired_caps["browserName"] = ""
     desired_caps["deviceName"] = "iPhone XS Simulator"
-    desired_caps["platformVersion"] = "12.2"
+    desired_caps["platformVersion"] = "13.4"
     desired_caps["platformName"] = "iOS"
     desired_caps["clearSystemFiles"] = True
     desired_caps["noReset"] = True
     desired_caps["automationName"] = "XCUITest"
     desired_caps["name"] = "iOSNativeApp checkWindow"
     desired_caps["deviceOrientation"] = "portrait"
-    desired_caps["appiumVersion"] = "1.13.0"
+    desired_caps["appiumVersion"] = "1.19.2"
     return desired_caps
 
 
@@ -288,6 +288,6 @@ def eyes_setup(runner, batch_info, stitch_mode, emulation):
         eyes.add_property("Page", page)
     yield eyes
     # If the test was aborted before eyes.close was called, ends the test as aborted.
-    eyes.abort_if_not_closed()
+    eyes.abort()
     if runner is not None:
         runner.get_all_test_results(False)
diff --git a/coverage-tests/test/pytest.ini b/coverage-tests/test/pytest.ini
@@ -1,5 +1,3 @@
 [pytest]
 python_files = *.py
 python_functions = Check* Should* Acme* Appium* test_* VariantId* Adopted*
-env =
-    APPLITOOLS_BATCH_NAME='Python Coverage Tests'
diff --git a/eyes_selenium/applitools/selenium/capture/eyes_webdriver_screenshot.py b/eyes_selenium/applitools/selenium/capture/eyes_webdriver_screenshot.py
@@ -80,14 +80,14 @@ def create_entire_element(
 
     @classmethod
     def from_screenshot(
-        cls, driver, image, screenshot_region, frame_location_in_parent_screenshot
+        cls, driver, image, screenshot_region, frame_location_in_screenshot
     ):
         # type: (EyesWebDriver, Image.Image, Region, Point) -> EyesWebDriverScreenshot
         return cls(
             driver,
             image,
             ScreenshotType.ENTIRE_FRAME,
-            frame_location_in_parent_screenshot - screenshot_region.location,
+            frame_location_in_screenshot,
             frame_window=Region.from_(Point.ZERO(), screenshot_region.size),
         )
 
@@ -198,7 +198,9 @@ def sub_screenshot(self, region, throw_if_clipped=False):
             self._driver,
             sub_image,
             Region(region.left, region.top, sub_image.width, sub_image.height),
-            self._frame_location_in_screenshot,
+            self._frame_location_in_screenshot
+            - as_is_sub_screenshot_region.location
+            - self._current_frame_scroll_position,
         )
 
     CONTEXT_RELATIVE = CoordinatesType.CONTEXT_RELATIVE
diff --git a/tests/functional/eyes_selenium/selenium/test_eyes.py b/tests/functional/eyes_selenium/selenium/test_eyes.py
@@ -133,3 +133,17 @@ def test_scrollable_modal_on_scrolled_down_page(driver):
     eyes.check(Target.region(content).scroll_root_element(content).fully())
 
     eyes.close()
+
+
+def test_layout_region_calculation_within_frame(driver, fake_connector_class):
+    eyes = Eyes()
+    eyes.server_connector = fake_connector_class()
+    driver = eyes.open(driver, "a", "b", RectangleSize(width=1024, height=768))
+    driver.get("https://applitools.github.io/demo/TestPages/CorsTestPage/index.html")
+
+    eyes.check(Target.frame("frame1").region("body").layout("#inner-frame-div"))
+
+    _, match_data = eyes.server_connector.calls["match_window"]
+    assert match_data.options.image_match_settings.layout_regions == [
+        Region(0, 0, 304, 184)
+    ]
diff --git a/tox.ini b/tox.ini
@@ -39,6 +39,7 @@ passenv =
     APPLITOOLS_BATCH_NAME
     TEST_REPORT_SANDBOX
     APPDATA
+    PYTHON*
 deps =
     invoke
     mock
