Workflow editor testing for step parameters/connections.

- Fixes and refactoring for existing input tests (toward reuse). - Add simple test for non-data input.
jmchilton · Oct 30, 2018 · 730020f · 730020f
1 parent 055d346
commit 730020f
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 11 deletions.
diff --git a/test/galaxy_selenium/navigation.yml b/test/galaxy_selenium/navigation.yml
@@ -264,6 +264,9 @@ workflow_editor:
     tool_menu_section_link: '#title___workflow__${section_name}__ a span'
     tool_menu_item_link: 'a#tool-menu-${section_name}-${item_name}'
 
+    connect_icon: 'div.ui-form-element[tour_id="${name}"] .ui-form-connected-icon'
+    collapse_icon: 'div.ui-form-element[tour_id="${name}"] .ui-form-collapsible-icon'
+
     label_input: "[tour_id='__label'] input"
     annotation_input: "[tour_id='__annotation'] textarea"
 

diff --git a/test/selenium_tests/test_workflow_editor.py b/test/selenium_tests/test_workflow_editor.py
@@ -54,10 +54,7 @@ def test_data_input(self):
         editor = self.components.workflow_editor
 
         name = self.workflow_create_new()
-        editor.canvas_body.wait_for_visible()
-        editor.tool_menu.wait_for_visible()
-        editor.tool_menu_section_link(section_name="inputs").wait_for_and_click()
-        editor.tool_menu_item_link(section_name="inputs", item_name="data_input").wait_for_and_click()
+        self.workflow_editor_add_input(item_name="data_input")
         self.screenshot("workflow_editor_data_input_new")
         editor.label_input.wait_for_and_send_keys("input1")
         editor.annotation_input.wait_for_and_send_keys("my cool annotation")
@@ -85,16 +82,13 @@ def test_collection_input(self):
         editor = self.components.workflow_editor
 
         name = self.workflow_create_new()
-        editor.canvas_body.wait_for_visible()
-        editor.tool_menu.wait_for_visible()
-        editor.tool_menu_section_link(section_name="inputs").wait_for_and_click()
-        editor.tool_menu_item_link(section_name="inputs", item_name="data_collection_input").wait_for_and_click()
-        self.screenshot("workflow_editor_data_input_collection_new")
+        self.workflow_editor_add_input(item_name="data_collection_input")
+        self.screenshot("workflow_editor_data_collection_input_new")
         editor.label_input.wait_for_and_send_keys("input1")
         editor.annotation_input.wait_for_and_send_keys("my cool annotation")
         editor.label_input.wait_for_and_click()  # Seems to help force the save of whole annotation.
         self.sleep_for(self.wait_types.UX_RENDER)
-        self.screenshot("workflow_editor_data_input_collection_filled_in")
+        self.screenshot("workflow_editor_data_collection_input_filled_in")
         self.workflow_editor_save_and_close()
         self.workflow_index_open_with_name(name)
         data_input_node = editor.node._(label="input1")
@@ -107,7 +101,82 @@ def test_collection_input(self):
 
         data_input_node.destroy.wait_for_and_click()
         data_input_node.wait_for_absent()
-        self.screenshot("workflow_editor_data_input_deleted")
+        self.screenshot("workflow_editor_data_collection_input_deleted")
+
+    @selenium_test
+    def test_integer_input(self):
+        editor = self.components.workflow_editor
+
+        name = self.workflow_create_new()
+        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")
+        editor.annotation_input.wait_for_and_send_keys("my cool annotation")
+        editor.label_input.wait_for_and_click()  # Seems to help force the save of whole annotation.
+        self.sleep_for(self.wait_types.UX_RENDER)
+        self.screenshot("workflow_editor_parameter_input_filled_in")
+        self.workflow_editor_save_and_close()
+        self.workflow_index_open_with_name(name)
+        data_input_node = editor.node._(label="input1")
+        data_input_node.title.wait_for_and_click()
+
+        label = editor.label_input.wait_for_value()
+        assert label == "input1", label
+        # should work but Galaxy is broken.
+        # assert editor.annotation_input.wait_for_value() == "my cool annotation"
+
+        data_input_node.destroy.wait_for_and_click()
+        data_input_node.wait_for_absent()
+        self.screenshot("workflow_editor_parameter_input_deleted")
+
+    @selenium_test
+    def test_non_data_connections(self):
+        self.open_in_workflow_editor("""
+class: GalaxyWorkflow
+inputs:
+  input_int: integer
+steps:
+  simple_constructs:
+    tool_id: simple_constructs
+    label: tool_exec
+    in:
+      inttest: input_int
+""")
+        self.screenshot("workflow_editor_parameter_connection_simple")
+        self.assert_connected("input_int#output", "simple_constructs#inttest")
+
+        editor = self.components.workflow_editor
+
+        tool_node = editor.node._(label="simple_constructs")
+        tool_input = tool_node.input_terminal(name="inttest")
+        tool_input.wait_for_and_click()
+
+        editor.connector_destroy_callout.wait_for_and_click()
+        self.assert_not_connected("input_int#output", "simple_constructs#inttest")
+        self.screenshot("workflow_editor_parameter_connection_destroyed")
+
+        # When connected, cannot turn it into a RuntimeValue..
+        collapse_input = editor.collapse_icon(name="inttest")
+        collapse_input.wait_for_absent_or_hidden()
+
+        # If it is disconnected, then can specify as RuntimeValue
+        connect_icon = editor.connect_icon(name="inttest")
+        connect_icon.wait_for_visible()
+        connect_icon.wait_for_and_click()
+        collapse_input.wait_for_visible()
+
+        # Also the connector should disappear
+        tool_input.wait_for_absent_or_hidden()
+
+        # Now make it connected again and watch the requestss
+        connect_icon.wait_for_and_click()
+
+        tool_input.wait_for_visible()
+        collapse_input.wait_for_absent_or_hidden()
+
+        self.workflow_editor_connect("input_int#output", "simple_constructs#inttest", screenshot_partial="workflow_editor_parameter_connection_dragging")
+        self.assert_connected("input_int#output", "simple_constructs#inttest")
 
     @selenium_test
     def test_existing_connections(self):
@@ -329,6 +398,16 @@ def workflow_editor_source_sink_terminal_ids(self, source, sink):
 
         return source_id, sink_id
 
+    def workflow_editor_add_input(self, item_name="data_input"):
+        editor = self.components.workflow_editor
+
+        # Make sure we're on the the workflow editor and not clicking the main tool panel.
+        editor.canvas_body.wait_for_visible()
+
+        editor.tool_menu.wait_for_visible()
+        editor.tool_menu_section_link(section_name="inputs").wait_for_and_click()
+        editor.tool_menu_item_link(section_name="inputs", item_name=item_name).wait_for_and_click()
+
     def workflow_editor_destroy_connection(self, sink):
         editor = self.components.workflow_editor