Adjust visualization test case, validate against visualization frame

galaxyproject · Apr 23, 2024 · 17d0703 · 17d0703
1 parent 54cbc64
commit 17d0703
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/client/src/components/Visualizations/VisualizationFrame.vue b/client/src/components/Visualizations/VisualizationFrame.vue
@@ -32,6 +32,7 @@ const srcWithRoot = computed(() => {
 
 <template>
     <iframe
+        id="galaxy_visualization"
         :src="srcWithRoot"
         class="center-frame"
         frameborder="0"

diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
@@ -54,6 +54,7 @@
 RETRY_DURING_TRANSITIONS_ATTEMPTS_DEFAULT = 10
 
 GALAXY_MAIN_FRAME_ID = "galaxy_main"
+GALAXY_VISUALIZATION_FRAME_ID = "galaxy_visualization"
 
 WaitType = collections.namedtuple("WaitType", ["name", "default_length"])
 
@@ -298,6 +299,15 @@ def main_panel(self):
         finally:
             self.driver.switch_to.default_content()
 
+    @contextlib.contextmanager
+    def visualization_panel(self):
+        """Decorator to operate within the context of Galaxy's visualization frame."""
+        try:
+            self.driver.switch_to.frame(GALAXY_VISUALIZATION_FRAME_ID)
+            yield
+        finally:
+            self.driver.switch_to.default_content()
+
     def api_get(self, endpoint, data=None, raw=False):
         data = data or {}
         full_url = self.build_url(f"api/{endpoint}", for_selenium=False)

diff --git a/lib/galaxy_test/selenium/test_visualizations.py b/lib/galaxy_test/selenium/test_visualizations.py
@@ -27,7 +27,7 @@ def test_charts_image_annotate(self):
         self.screenshot("visualization_plugins_png")
         self.components.visualization.plugin_item(id="annotate_image").wait_for_and_click()
 
-        with self.main_panel():
+        with self.visualization_panel():
             self.wait_for_selector("#image-annotate")
             self.screenshot("visualization_plugin_charts_image_annotate")
 
@@ -44,6 +44,6 @@ def test_charts_nvd3_bar(self):
         self.screenshot("visualization_plugins_sam")
         self.components.visualization.plugin_item(id="nvd3_bar").wait_for_and_click()
 
-        with self.main_panel():
+        with self.visualization_panel():
             self.wait_for_selector("g.nvd3")
             self.screenshot("visualization_plugin_charts_nvd3_bar_landing")