Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[23.2] Set from_tool_form: true when saving new workflow #17972

Merged
merged 2 commits into from
Apr 11, 2024
Merged

[23.2] Set from_tool_form: true when saving new workflow #17972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d737f
Don't save in test_integer_input
mvdbeek Apr 11, 2024
0ec987f
Set from_tool_form: true when saving new workflow
mvdbeek Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/src/components/Workflow/services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class Services {
async createWorkflow(workflow) {
const url = withPrefix("/api/workflows");
try {
const { data } = await axios.post(url, { workflow: toSimple(workflow.id, workflow) });
const { data } = await axios.post(url, { workflow: toSimple(workflow.id, workflow), from_tool_form: true });
return data;
} catch (e) {
rethrowSimple(e);
Expand Down
13 changes: 7 additions & 6 deletions lib/galaxy/selenium/navigates_galaxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1510,7 +1510,7 @@ def workflow_run_ensure_expanded(self):
workflow_run.expand_form_link.wait_for_and_click()
workflow_run.expanded_form.wait_for_visible()

def workflow_create_new(self, annotation=None, clear_placeholder=False):
def workflow_create_new(self, annotation=None, clear_placeholder=False, save_workflow=True):
self.workflow_index_open()
self.sleep_for(self.wait_types.UX_RENDER)
self.click_button_new_workflow()
Expand All @@ -1522,11 +1522,12 @@ def workflow_create_new(self, annotation=None, clear_placeholder=False):
name_component.wait_for_and_send_keys(name)
annotation = annotation or self._get_random_name()
self.components.workflow_editor.edit_annotation.wait_for_and_send_keys(annotation)
save_button = self.components.workflow_editor.save_button
save_button.wait_for_visible()
assert not save_button.has_class("disabled")
save_button.wait_for_and_click()
self.sleep_for(self.wait_types.UX_RENDER)
if save_workflow:
save_button = self.components.workflow_editor.save_button
save_button.wait_for_visible()
assert not save_button.has_class("disabled")
save_button.wait_for_and_click()
self.sleep_for(self.wait_types.UX_RENDER)
return name

def invocation_index_table_elements(self):
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy_test/selenium/test_workflow_editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def test_data_column_input_editing(self):
def test_integer_input(self):
editor = self.components.workflow_editor

name = self.workflow_create_new()
name = self.workflow_create_new(save_workflow=False)
self.workflow_editor_add_input(item_name="parameter_input")
self.screenshot("workflow_editor_parameter_input_new")
editor.label_input.wait_for_and_send_keys("input1")
Expand Down
Loading