Skip to content

Commit

Permalink
Selenium fixes for parameter validation changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmchilton committed Nov 13, 2024
1 parent 5219968 commit 03c72e6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions lib/galaxy_test/selenium/test_tool_form.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,28 +191,28 @@ def test_rerun_deleted_dataset(self):
error_col = self.components.tool_form.parameter_error(parameter="col").wait_for_visible()
assert (
error_input1.text
== "parameter 'input1': the previously selected dataset has been deleted. Using default: ''."
== "Parameter 'input1': the previously selected dataset has been deleted. Using default: ''."
)
assert error_col.text == "parameter 'col': an invalid option ('3') was selected (valid options: 1)"
assert error_col.text == "Parameter 'col': an invalid option ('3') was selected (valid options: 1)"
# validate errors when inputs are missing
self.components.tool_form.parameter_data_input_collection(parameter="input1").wait_for_and_click()
self.sleep_for(self.wait_types.UX_TRANSITION)
error_input1 = self.components.tool_form.parameter_error(parameter="input1").wait_for_visible()
error_col = self.components.tool_form.parameter_error(parameter="col").wait_for_visible()
error_col_names = self.components.tool_form.parameter_error(parameter="col_names").wait_for_visible()
assert error_input1.text == "Please provide a value for this option."
assert error_col.text == "parameter 'col': requires a value, but no legal values defined"
assert error_col_names.text == "parameter 'col_names': requires a value, but no legal values defined"
assert error_col.text == "Parameter 'col': requires a value, but no legal values defined"
assert error_col_names.text == "Parameter 'col_names': requires a value, but no legal values defined"
# validate warnings when inputs are restored
self.components.tool_form.parameter_data_input_single(parameter="input1").wait_for_and_click()
self.sleep_for(self.wait_types.UX_TRANSITION)
error_input1 = self.components.tool_form.parameter_error(parameter="input1").wait_for_visible()
error_col = self.components.tool_form.parameter_error(parameter="col").wait_for_visible()
assert (
error_input1.text
== "parameter 'input1': the previously selected dataset has been deleted. Using default: ''."
== "Parameter 'input1': the previously selected dataset has been deleted. Using default: ''."
)
assert error_col.text == "parameter 'col': an invalid option ('3') was selected (valid options: 1)"
assert error_col.text == "Parameter 'col': an invalid option ('3') was selected (valid options: 1)"

@selenium_test
def test_rerun_dataset_collection_element(self):
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy_test/selenium/test_workflow_editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ def test_editor_subworkflow_tool_upgrade_message(self):
self.components.workflows.edit_button.wait_for_and_click()
self.sleep_for(self.wait_types.UX_RENDER)
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.assert_modal_has_text("Parameter 'inttest': an integer or workflow parameter is required")
self.screenshot("workflow_editor_subworkflow_tool_upgrade")
self.components.workflow_editor.modal_button_continue.wait_for_and_click()
self.assert_workflow_has_changes_and_save()
Expand Down

0 comments on commit 03c72e6

Please sign in to comment.