X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b6e28fbe905737bd0ea5bda5f4fd74fd259c58b1..a6f8d9e254b27305f8f61adc04b685206531237e:/apps/workbench/test/integration/pipeline_instances_test.rb

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index a27aff1029..b996068b32 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -40,14 +40,17 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     visit '/projects'
     find('.arv-project-list a,button', text: 'A Project').click
     find('.btn', text: 'Add data').click
-    find('span', text: 'foo_tag').click
     within('.modal-dialog') do
+      wait_for_ajax
+      first('span', text: 'foo_tag').click
       find('.btn', text: 'Add').click
     end
-    wait_for_ajax
+    using_wait_time(Capybara.default_wait_time * 3) do
+      wait_for_ajax
+    end
 
     click_link 'Jobs and pipelines'
-    find('tr[data-kind="arvados#pipelineInstance"]', text: 'New pipeline instance').
+    find('tr[data-kind="arvados#pipelineInstance"]', text: '(none)').
       find('a', text: 'Show').
       click
 
@@ -60,10 +63,10 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     within('.modal-dialog') do
       assert(has_text?("Foo/bar pair"),
              "pipeline input picker missing name of input")
+      wait_for_ajax
       first('span', text: 'foo_tag').click
       find('button', text: 'OK').click
     end
-
     wait_for_ajax
 
     # "Run" button is now enabled
@@ -98,14 +101,19 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     # Add this collection to the project using collections menu from top nav
     visit '/projects'
     find('.arv-project-list a,button', text: 'A Project').click
-
-    find('li.selection-menu > a').click
-    click_button 'Copy selections into this project'
+    find('.btn', text: 'Add data').click
+    within('.modal-dialog') do
+      wait_for_ajax
+      first('span', text: 'foo_tag').click
+      find('.btn', text: 'Add').click
+    end
+    using_wait_time(Capybara.default_wait_time * 3) do
+      wait_for_ajax
+    end
 
     # create a pipeline instance
     find('.btn', text: 'Run a pipeline').click
     within('.modal-dialog') do
-      assert page.has_text? 'Two Part Pipeline Template'
       find('.selectable', text: 'Two Part Pipeline Template').click
       find('.btn', text: 'Next: choose inputs').click
     end
@@ -118,10 +126,10 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
     within('.modal-dialog') do
       assert_selector 'button.dropdown-toggle', text: 'A Project'
+      wait_for_ajax
       first('span', text: 'foo_tag').click
       find('button', text: 'OK').click
     end
-
     wait_for_ajax
 
     # "Run" button present and enabled
@@ -150,6 +158,26 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     assert page.has_text? 'script_version'
   end
 
+  test 'pipeline description' do
+    visit page_with_token('active_trustedclient')
+
+    visit '/pipeline_instances'
+    assert page.has_text? 'pipeline_with_job'
+
+    find('a', text: 'pipeline_with_job').click
+
+    within('.arv-description-as-subtitle') do
+      find('.fa-pencil').click
+      find('.editable-input textarea').set('*Textile description for pipeline instance*')
+      find('.editable-submit').click
+    end
+    wait_for_ajax
+
+    # verify description
+    assert page.has_no_text? '*Textile description for pipeline instance*'
+    assert page.has_text? 'Textile description for pipeline instance'
+  end
+
   test "JSON popup available for strange components" do
     uuid = api_fixture("pipeline_instances")["components_is_jobspec"]["uuid"]
     visit page_with_token("active", "/pipeline_instances/#{uuid}")
@@ -160,4 +188,37 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     assert(page.has_text?("script_parameters"),
            "components JSON not found")
   end
+
+  PROJECT_WITH_SEARCH_COLLECTION = "A Subproject"
+  def check_parameter_search(proj_name)
+    template = api_fixture("pipeline_templates")["parameter_with_search"]
+    search_text = template["components"]["with-search"]["script_parameters"]["input"]["search_for"]
+    visit page_with_token("active", "/pipeline_templates/#{template['uuid']}")
+    click_on "Run this pipeline"
+    within(".modal-dialog") do  # Set project for the new pipeline instance
+      find(".selectable", text: proj_name).click
+      click_on "Choose"
+    end
+    assert(has_text?("This pipeline was created from the template"), "did not land on pipeline instance page")
+    first("a.btn,button", text: "Choose").click
+    within(".modal-body") do
+      if (proj_name != PROJECT_WITH_SEARCH_COLLECTION)
+        # Switch finder modal to Subproject to find the Collection.
+        click_on proj_name
+        click_on PROJECT_WITH_SEARCH_COLLECTION
+      end
+      assert_equal(search_text, first("input").value,
+                   "parameter search not preseeded")
+      assert(has_text?(api_fixture("collections")["baz_collection_name_in_asubproject"]["name"]),
+             "baz Collection not in preseeded search results")
+    end
+  end
+
+  test "Workbench respects search_for parameter in templates" do
+    check_parameter_search(PROJECT_WITH_SEARCH_COLLECTION)
+  end
+
+  test "Workbench preserves search_for parameter after project switch" do
+    check_parameter_search("A Project")
+  end
 end