ensure state upgrade modal is closed

fix `workflow_editor_dismiss_state_upgrade_modal` method for `GModal`

Author: ahmedhamidawan

lib/galaxy_test/selenium/test_workflow_editor.py

@@ -1593,9 +1593,9 @@ def workflow_editor_dismiss_state_upgrade_modal(self):
         """
         editor = self.components.workflow_editor
         self.sleep_for(self.wait_types.UX_RENDER)
-        if not editor.state_upgrade_modal.is_absent:
-            editor.modal_button_continue.wait_for_and_click()
-            editor.state_upgrade_modal.wait_for_absent()
+        if editor.state_upgrade_modal.is_displayed:
+            editor.state_upgrade_modal_close.wait_for_and_click()
+            editor.state_upgrade_modal.wait_for_absent_or_hidden()
 
     def workflow_editor_destroy_connection(self, sink):
         editor = self.components.workflow_editor

test/integration_selenium/test_workflow_repository_tool_update.py

@@ -66,7 +66,7 @@ def test_tool_shed_unmatched_version_upgrade(self):
         self.components.workflows.edit_button.wait_for_and_click()
         self.assert_modal_has_text("Using version '0.1.1' instead of version '0.0.0'")
         self.screenshot("workflow_editor_tool_repository_upgrade")
-        self.components.workflow_editor.modal_button_close.wait_for_and_click()
+        self.components.workflow_editor.state_upgrade_modal_close.wait_for_and_click()
         self.assert_workflow_has_changes_and_save()
         workflow = self.workflow_populator.download_workflow(workflow_id)
         assert (