X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bc4992f9e11cd0639cf6461736963d66830c5af8..e89251c160ae409f8af2f9ecae5ffb210ccd0a8d:/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 cdaa3f1f38..9f4ce692e5 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -1,13 +1,8 @@
 require 'integration_helper'
-require 'selenium-webdriver'
-require 'headless'
 
 class PipelineInstancesTest < ActionDispatch::IntegrationTest
   setup do
-    # Selecting collections requiresLocalStorage
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
+    need_javascript
   end
 
   test 'Create and run a pipeline' do
@@ -29,22 +24,16 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
     instance_page = current_path
 
-    # Go over to the collections page and select something
-    visit '/collections'
-    within('tr', text: 'GNU_General_Public_License') do
-      find('input[type=checkbox]').click
-    end
-    find('#persistent-selection-count').click
-
     # Add this collection to the project
     visit '/projects'
     find("#projects-menu").click
     find('.dropdown-menu a,button', text: 'A Project').click
     find('.btn', text: 'Add data').click
+    find('.dropdown-menu a,button', text: 'Copy data from another project').click
     within('.modal-dialog') do
       wait_for_ajax
       first('span', text: 'foo_tag').click
-      find('.btn', text: 'Add').click
+      find('.btn', text: 'Copy').click
     end
     using_wait_time(Capybara.default_wait_time * 3) do
       wait_for_ajax
@@ -70,18 +59,36 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     end
     wait_for_ajax
 
+    # The input, after being specified, should still be displayed (#3382)
+    assert find('div.form-group', text: 'Foo/bar pair')
+
+    # The input, after being specified, should still be editable (#3382)
+    find('div.form-group', text: 'Foo/bar pair').
+      find('.btn', text: 'Choose').click
+
+    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
+
+    # For good measure, check one last time that the input, after being specified twice, is still be displayed (#3382)
+    assert find('div.form-group', text: 'Foo/bar pair')
+
     # Ensure that the collection's portable_data_hash, uuid and name
     # are saved in the desired places. (#4015)
 
     # foo_collection_in_aproject is the collection tagged with foo_tag.
-    col = api_fixture('collections', 'foo_collection_in_aproject')
+    collection = api_fixture('collections', 'foo_collection_in_aproject')
     click_link 'Advanced'
     click_link 'API response'
     api_response = JSON.parse(find('div#advanced_api_response pre').text)
     input_params = api_response['components']['part-one']['script_parameters']['input']
-    assert_equal input_params['value'], col['portable_data_hash']
-    assert_equal input_params['selection_name'], col['name']
-    assert_equal input_params['selection_uuid'], col['uuid']
+    assert_equal input_params['value'], collection['portable_data_hash']
+    assert_equal input_params['selection_name'], collection['name']
+    assert_equal input_params['selection_uuid'], collection['uuid']
 
     # "Run" button is now enabled
     page.assert_no_selector 'a.disabled,button.disabled', text: 'Run'
@@ -106,34 +113,28 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
   test 'Create pipeline inside a project and run' do
     visit page_with_token('active_trustedclient')
 
-    # Go over to the collections page and select something
-    visit '/collections'
-    within('tr', text: 'GNU_General_Public_License') do
-      find('input[type=checkbox]').click
-    end
-    find('#persistent-selection-count').click
-
     # Add this collection to the project using collections menu from top nav
     visit '/projects'
     find("#projects-menu").click
     find('.dropdown-menu a,button', text: 'A Project').click
     find('.btn', text: 'Add data').click
+    find('.dropdown-menu a,button', text: 'Copy data from another project').click
     within('.modal-dialog') do
       wait_for_ajax
       first('span', text: 'foo_tag').click
-      find('.btn', text: 'Add').click
+      find('.btn', text: 'Copy').click
     end
     using_wait_time(Capybara.default_wait_time * 3) do
       wait_for_ajax
     end
 
-    create_and_run_pipeline_in_aproject true
+    create_and_run_pipeline_in_aproject true, 'Two Part Pipeline Template', 'foo_collection_in_aproject', false
   end
 
   # Create a pipeline instance from outside of a project
   test 'Run a pipeline from dashboard' do
     visit page_with_token('active_trustedclient')
-    create_and_run_pipeline_in_aproject false
+    create_and_run_pipeline_in_aproject false, 'Two Part Pipeline Template', 'foo_collection_in_aproject', false
   end
 
   test 'view pipeline with job and see graph' do
@@ -214,6 +215,46 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     check_parameter_search("A Project")
   end
 
+  [
+    [true, 'Two Part Pipeline Template', 'foo_collection_in_aproject', false],
+    [false, 'Two Part Pipeline Template', 'foo_collection_in_aproject', false],
+    [true, 'Two Part Template with dataclass File', 'foo_collection_in_aproject', true],
+    [false, 'Two Part Template with dataclass File', 'foo_collection_in_aproject', true],
+    [true, 'Two Part Pipeline Template', 'collection_with_no_name_in_aproject', false],
+  ].each do |in_aproject, template_name, collection, choose_file|
+    test "Run pipeline instance in #{in_aproject} with #{template_name} with #{collection} file #{choose_file}" do
+      if in_aproject
+        visit page_with_token 'active', \
+        '/projects/'+api_fixture('groups')['aproject']['uuid']
+      else
+        visit page_with_token 'active', '/'
+      end
+
+      # need bigger modal size when choosing a file from collection
+      if Capybara.current_driver == :selenium
+        Capybara.current_session.driver.browser.manage.window.resize_to(1200, 800)
+      end
+
+      create_and_run_pipeline_in_aproject in_aproject, template_name, collection, choose_file
+      instance_path = current_path
+
+      # Pause the pipeline
+      find('a,button', text: 'Pause').click
+      assert page.has_text? 'Paused'
+      page.assert_no_selector 'a.disabled,button.disabled', text: 'Resume'
+      page.assert_selector 'a,button', text: 'Re-run with latest'
+      page.assert_selector 'a,button', text: 'Re-run options'
+
+      # Verify that the newly created instance is created in the right project.
+      assert page.has_text? 'Home'
+      if in_aproject
+        assert page.has_text? 'A Project'
+      else
+        assert page.has_no_text? 'A Project'
+      end
+    end
+  end
+
   [
     ['active', false, false, false],
     ['active', false, false, true],
@@ -222,18 +263,22 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     ['active', true, false, true],
     ['active', true, true, true],
     ['project_viewer', false, false, true],
-    ['project_viewer', true, false, true],
     ['project_viewer', true, true, true],
   ].each do |user, with_options, choose_options, in_aproject|
     test "Rerun pipeline instance as #{user} using options #{with_options} #{choose_options} in #{in_aproject}" do
-      visit page_with_token('active')
-
       if in_aproject
-        find("#projects-menu").click
-        find('.dropdown-menu a,button', text: 'A Project').click
+        visit page_with_token 'active', \
+        '/projects/'+api_fixture('groups')['aproject']['uuid']
+      else
+        visit page_with_token 'active', '/'
+      end
+
+      # need bigger modal size when choosing a file from collection
+      if Capybara.current_driver == :selenium
+        Capybara.current_session.driver.browser.manage.window.resize_to(1200, 800)
       end
 
-      create_and_run_pipeline_in_aproject in_aproject
+      create_and_run_pipeline_in_aproject in_aproject, 'Two Part Pipeline Template', 'foo_collection_in_aproject'
       instance_path = current_path
 
       # Pause the pipeline
@@ -254,7 +299,9 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
       # Now re-run the pipeline
       if with_options
-        find('a,button', text: 'Re-run options').click
+        assert_triggers_dom_event 'shown.bs.modal' do
+          find('a,button', text: 'Re-run options').click
+        end
         within('.modal-dialog') do
           page.assert_selector 'a,button', text: 'Copy and edit inputs'
           page.assert_selector 'a,button', text: 'Run now'
@@ -268,26 +315,29 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
         find('a,button', text: 'Re-run with latest').click
       end
 
-      # Verify that the newly created instance is created in the right project.
-      # In case of project_viewer user, since the use cannot write to the project,
-      # the pipeline should have been created in the user's Home project.
-      rerun_instance_path = current_path
-      assert_not_equal instance_path, rerun_instance_path, 'Rerun instance path expected to be different'
-      assert page.has_text? 'Home'
+      # Verify that the newly created instance is created in the right
+      # project. In case of project_viewer user, since the user cannot
+      # write to the project, the pipeline should have been created in
+      # the user's Home project.
+      assert_not_equal instance_path, current_path, 'Rerun instance path expected to be different'
+      assert_text 'Home'
       if in_aproject && (user != 'project_viewer')
-        assert page.has_text? 'A Project'
+        assert_text 'A Project'
       else
-        assert page.has_no_text? 'A Project'
+        assert_no_text 'A Project'
       end
     end
   end
 
   # Create and run a pipeline for 'Two Part Pipeline Template' in 'A Project'
-  def create_and_run_pipeline_in_aproject in_aproject
+  def create_and_run_pipeline_in_aproject in_aproject, template_name, collection_fixture, choose_file=false
+    # collection in aproject to be used as input
+    collection = api_fixture('collections', collection_fixture)
+
     # create a pipeline instance
     find('.btn', text: 'Run a pipeline').click
     within('.modal-dialog') do
-      find('.selectable', text: 'Two Part Pipeline Template').click
+      find('.selectable', text: template_name).click
       find('.btn', text: 'Next: choose inputs').click
     end
 
@@ -308,23 +358,41 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
         click_link "A Project"
         wait_for_ajax
       end
-      first('span', text: 'foo_tag').click
+
+      if collection_fixture == 'foo_collection_in_aproject'
+        first('span', text: 'foo_tag').click
+      elsif collection['name']
+        first('span', text: "#{collection['name']}").click
+      else
+        collection_uuid = collection['uuid']
+        find("div[data-object-uuid=#{collection_uuid}]").click
+      end
+
+      if choose_file
+        wait_for_ajax
+        find('.preview-selectable', text: 'foo').click
+      end
       find('button', text: 'OK').click
     end
-    wait_for_ajax
+
+    # The input, after being specified, should still be displayed (#3382)
+    assert find('div.form-group', text: 'Foo/bar pair')
 
     # Ensure that the collection's portable_data_hash, uuid and name
     # are saved in the desired places. (#4015)
-
-    # foo_collection_in_aproject is the collection tagged with foo_tag.
-    col = api_fixture('collections', 'foo_collection_in_aproject')
     click_link 'Advanced'
     click_link 'API response'
+
     api_response = JSON.parse(find('div#advanced_api_response pre').text)
     input_params = api_response['components']['part-one']['script_parameters']['input']
-    assert_equal input_params['value'], col['portable_data_hash']
-    assert_equal input_params['selection_name'], col['name']
-    assert_equal input_params['selection_uuid'], col['uuid']
+    assert_equal(input_params['selection_uuid'], collection['uuid'], "Not found expected input param uuid")
+    if choose_file
+      assert_equal(input_params['value'], collection['portable_data_hash']+'/foo', "Not found expected input file param value")
+      assert_equal(input_params['selection_name'], collection['name']+'/foo', "Not found expected input file param name")
+    else
+      assert_equal(input_params['value'], collection['portable_data_hash'], "Not found expected input param value")
+      assert_equal(input_params['selection_name'], collection['name'], "Not found expected input selection name")
+    end
 
     # "Run" button present and enabled
     page.assert_no_selector 'a.disabled,button.disabled', text: 'Run'
@@ -375,24 +443,25 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     ['admin', nil, 40, 200],
     ['admin', 'FUSE project', 1, 1],
     ['admin', 'pipeline_10', 2, 2],
-    ['active', 'containing at least two', 2, 100],  # component description
-    ['admin', 'containing at least two', 2, 100],
+    ['active', 'containing at least two', 2, 100],
     ['active', nil, 10, 100],
     ['active', 'no such match', 0, 0],
   ].each do |user, search_filter, expected_min, expected_max|
     test "scroll pipeline instances page for #{user} with search filter #{search_filter}
-          and expect more than #{expected_min} and less than #{expected_max}" do
+          and expect #{expected_min} <= found_items <= #{expected_max}" do
       visit page_with_token(user, "/pipeline_instances")
 
       if search_filter
         find('.recent-pipeline-instances-filterable-control').set(search_filter)
+        # Wait for 250ms debounce timer (see filterable.js)
+        sleep 0.350
         wait_for_ajax
       end
 
       page_scrolls = expected_max/20 + 2    # scroll num_pages+2 times to test scrolling is disabled when it should be
       within('.arv-recent-pipeline-instances') do
         (0..page_scrolls).each do |i|
-          page.execute_script "window.scrollBy(0,999000)"
+          page.driver.scroll_to 0, 999000
           begin
             wait_for_ajax
           rescue
@@ -405,7 +474,8 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       found_count = found_items.count
       if expected_min == expected_max
         assert_equal(true, found_count == expected_min,
-          "Not found expected number of items. Expected at least #{expected_min} and found #{found_count}")
+          "Not found expected number of items. Expected #{expected_min} and found #{found_count}")
+        assert page.has_no_text? 'request failed'
       else
         assert_equal(true, found_count>=expected_min,
           "Found too few items. Expected at least #{expected_min} and found #{found_count}")