Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 23 insertions, 3 deletions

diff --git a/taskcluster/docker/snap-coreXX-build/snap-tests/basic_tests.py b/taskcluster/docker/snap-coreXX-build/snap-tests/basic_tests.py
index 87320d5638..e567c9c2e9 100644
--- a/taskcluster/docker/snap-coreXX-build/snap-tests/basic_tests.py
+++ b/taskcluster/docker/snap-coreXX-build/snap-tests/basic_tests.py
@@ -373,6 +373,9 @@ class SnapTests(SnapTestsBase):
         return rv
 
     def test_youtube_film(self, exp):
+        # Bug 1885473: require sign-in?
+        return True
+
         self.open_tab("https://www.youtube.com/watch?v=i4FSx9LXVSE")
         if not self.wait_for_enable_drm():
             self._logger.info("Skipped on ESR because cannot enable DRM")
diff --git a/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests.py b/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests.py
index 7788dabe34..4c843b31d5 100644
--- a/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests.py
+++ b/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests.py
@@ -466,7 +466,21 @@ class QATests(SnapTestsBase):
         )
         action.drag_and_drop_by_offset(paragraph, 50, 10).perform()
         time.sleep(0.75)
-        self.assert_rendering(exp["select_text"], self._driver)
+        try:
+            ref_screen_source = "select_text_with_highlight"
+            self._wait.until(
+                EC.visibility_of_element_located(
+                    (By.CSS_SELECTOR, "button.highlightButton")
+                )
+            )
+        except TimeoutException:
+            ref_screen_source = "select_text_without_highlight"
+            self._logger.info(
+                "Wait for pdf highlight button: timed out, maybe it is not there"
+            )
+        finally:
+            time.sleep(0.75)
+            self.assert_rendering(exp[ref_screen_source], self._driver)
 
         # release select selection
         action.move_by_offset(0, 150).perform()
diff --git a/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/qa_expectations.json b/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/qa_expectations.json
index f9806ffa90..32f74a1025 100644
--- a/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/qa_expectations.json
+++ b/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/qa_expectations.json
@@ -56,8 +56,11 @@
     "documentProperties": {
       "reference": "test_pdf_navigation_documentProperties.png"
     },
-    "select_text": {
-      "reference": "test_pdf_navigation_select_text.png"
+    "select_text_with_highlight": {
+      "reference": "test_pdf_navigation_select_text_with_highlight.png"
+    },
+    "select_text_without_highlight": {
+      "reference": "test_pdf_navigation_select_text_without_highlight.png"
     },
     "hand_tool": {
       "reference": "test_pdf_navigation_hand_tool.png"
diff --git a/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/test_pdf_navigation_select_text_with_highlight.png b/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/test_pdf_navigation_select_text_with_highlight.png
new file mode 100644
index 0000000000..9e2e7458a6
--- /dev/null
+++ b/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/test_pdf_navigation_select_text_with_highlight.png
diff --git a/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/test_pdf_navigation_select_text.png b/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/test_pdf_navigation_select_text_without_highlight.png
index 0e24a1ac74..0e24a1ac74 100644
--- a/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/test_pdf_navigation_select_text.png
+++ b/taskcluster/docker/snap-coreXX-build/snap-tests/qa_tests/test_pdf_navigation_select_text_without_highlight.png