4084: Ignore bubbling arv-log-event events, just process each once at the original...

[arvados.git] / 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 d93bba7fc665125845999481c8134fcfeb3f8e5b..7095a87442ab9179f39a9918ec2fc061148eea66 100644 (file)
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -70,6 +70,19 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     end
     wait_for_ajax
 
+    # 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']
+
     # "Run" button is now enabled
     page.assert_no_selector 'a.disabled,button.disabled', text: 'Run'
 
@@ -117,57 +130,12 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     create_and_run_pipeline_in_aproject true
   end
 
-  # Create a pipeline instance from without a project
+  # 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
   end
 
-  # Test that the portable_data_hash is recorded when choosing an
-  # input collection for a pipeline
-  test 'pipeline input collections are recorded with portable_data_hash' do
-    visit page_with_token('active_trustedclient')
-
-    template = api_fixture('pipeline_templates')['simple_pipeline']
-
-    visit '/pipeline_templates'
-    within('tr', text: template['name']) do
-      find('a,button', text: 'Run').click
-    end
-
-    # project chooser
-    project = api_fixture('groups')['aproject']
-    within('.modal-dialog') do
-      find('.selectable', text: project['name']).click
-      find('button', text: 'Choose').click
-    end
-
-    # find the collection input field
-    input = page.all('a', text: 'Choose').select { |a|
-      a[:href] =~ /Choose.a.dataset.for.simple.pipeline.input/
-    }
-    assert_not_empty input
-    input.first.click
-
-    # Select a collection
-    col = api_fixture('collections')['collection_input_for_simple_pipeline']
-    within('.modal-dialog') do
-      find('div.selectable', text: col['name']).click
-      find('button', text: 'OK').click
-    end
-
-    # The collection's portable_data_hash, name, and uuid should have
-    # been recorded, respectively, as the value, selection_name and selection_uuid
-    # for this component's input script_parameter.
-    click_link 'Advanced'
-    click_link 'API response'
-    api_response = JSON.parse(find('div#advanced_api_response pre').text)
-    input_params = api_response['components']['foo_component']['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']
-  end
-
   test 'view pipeline with job and see graph' do
     visit page_with_token('active_trustedclient')
 
@@ -179,7 +147,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     # since the pipeline component has a job, expect to see the graph
     assert page.has_text? 'Graph'
     click_link 'Graph'
-    assert page.has_text? 'script_version'
+    page.assert_selector "#provenance_graph"
   end
 
   test 'pipeline description' do
@@ -345,6 +313,19 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     end
     wait_for_ajax
 
+    # 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']
+
     # "Run" button present and enabled
     page.assert_no_selector 'a.disabled,button.disabled', text: 'Run'
     first('a,button', text: 'Run').click
@@ -359,8 +340,8 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
   end
 
   [
-    [0, 0], # run time 0 minutes
-    [9, 17*60*60 + 51*60], # run time 17 hours and 51 minutes
+    [1, 0], # run time 0 minutes
+    [10, 17*60*60 + 51*60], # run time 17 hours and 51 minutes
   ].each do |index, run_time|
     test "pipeline start and finish time display #{index}" do
       visit page_with_token("user1_with_load", "/pipeline_instances/zzzzz-d1hrv-10pipelines0#{index.to_s.rjust(3, '0')}")