close GModals so we avoid AXE fails

Author: ahmedhamidawan

client/src/components/Workflow/Editor/Index.vue

@@ -20,6 +20,7 @@
             :show.sync="showSaveAsModal"
             confirm
             size="small"
+            data-description="save-as-modal"
             title="Save As a New Workflow"
             ok-text="Save"
             @ok="doSaveAs"

client/src/utils/navigation/navigation.yml

@@ -1046,6 +1046,7 @@ workflow_editor:
     save_button: '#workflow-save-button'
     state_upgrade_modal: '[data-description="workflow state upgrade modal"]'
     state_upgrade_modal_close: '[data-description="workflow state upgrade modal"] .g-modal-close-button'
+    save_as_modal_close: '[data-description="save-as-modal"] .g-modal-close-button'
     workflow_activity: '#activity-workflow-editor-workflows'
     save_as_activity: "#activity-save-workflow-as"
     column_definitions: '[data-description="edit column definitions"]'

lib/galaxy/selenium/navigates_galaxy.py

@@ -1952,6 +1952,7 @@ def workflow_rename(self, new_name, workflow_index=0):
         self.components.workflows.rename_input.wait_for_visible().clear()
         self.components.workflows.rename_input.wait_for_and_send_keys(new_name)
         self.components.workflows.rename_input.wait_for_and_send_keys(Keys.ENTER)
+        self.wait_for_selector_absent_or_hidden(".g-modal")
 
     def workflow_delete_by_name(self, name):
         self.workflow_index_search_for(name)

lib/galaxy_test/selenium/test_workflow_editor.py

@@ -636,6 +636,7 @@ def test_save_as(self):
         self.screenshot("workflow_editor_edit_menu")
 
         self.components.workflow_editor.save_as_activity.wait_for_and_click()
+        self.components.workflow_editor.save_as_modal_close.wait_for_and_click()
 
     @selenium_test
     def test_editor_tool_upgrade(self):
@@ -721,8 +722,10 @@ def test_editor_subworkflow_tool_upgrade_message(self):
         self.assert_modal_has_text("Using version '0.2' instead of version '0.0.1'")
         self.assert_modal_has_text("Parameter 'inttest': an integer or workflow parameter is required")
         self.screenshot("workflow_editor_subworkflow_tool_upgrade")
-        self.components.workflow_editor.state_upgrade_modal_close.wait_for_and_click()
+        self.workflow_editor_dismiss_state_upgrade_modal()
         self.assert_workflow_has_changes_and_save()
+        # Ensure that the state upgrade modal is hidden by the end, to ensure AXE checks pass (no dialog should be present)
+        self.workflow_editor_dismiss_state_upgrade_modal()
 
     @staticmethod
     def set_text_element(element, value):
@@ -1051,6 +1054,7 @@ def test_editor_invalid_tool_state(self):
         self.assert_modal_has_text("Using version '0.2' instead of version '0.0.1'")
         self.assert_modal_has_text("Using default: '1'")
         self.screenshot("workflow_editor_invalid_state")
+        self.workflow_editor_dismiss_state_upgrade_modal()
 
     @selenium_test
     def test_missing_tools(self):
@@ -1069,6 +1073,7 @@ def test_missing_tools(self):
         self.components.workflows.edit_button.wait_for_and_click()
         self.assert_modal_has_text("Tool is not installed")
         self.screenshot("workflow_editor_missing_tool")
+        self.workflow_editor_dismiss_state_upgrade_modal()
 
     def tab_to(self, accessible_name, direction="forward"):
         for _ in range(100):