X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/183df814d5cb49d11614acb73b07e4e2809524e2..51e79a3be745cfd37efc49471ae21a1d54662e7f:/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 6547933994..ee4a660f55 100644
--- 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,7 +130,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     create_and_run_pipeline_in_aproject true
   end
 
-  # Create a pipeline instance from within a project and run
+  # 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
@@ -300,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
@@ -313,48 +339,29 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     assert_not page.has_text? 'Graph'
   end
 
-  (1..10).each do |index|
+  [
+    [0, 0], # run time 0 minutes
+    [9, 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')}")
-      assert page.has_text? 'This pipeline started at'
 
+      assert page.has_text? 'This pipeline started at'
       page_text = page.text
-      match = /This pipeline started at (.*)\. It failed after (.*) seconds at (.*)\. Check the Log/.match page_text
-      start_at = match[1].split(' ')
-      ran_for = match[2].split(' ')
-      finished_at = match[3].split(' ')
 
-      # start and finished time display is of the format '2:20 PM 10/20/2014'
-      start_date = start_at[2].split('/')
-      start_time = Time.parse(start_date[2]+'/'+start_date[0]+'/'+start_date[1]+'T'+start_at[0])
-      if start_at[1].eql?('PM') and !start_at[0].start_with?('12:')
-        start_time += 12*60*60 
-      end
-
-      finished_date = finished_at[2].split('/')
-      finished_time = Time.parse(finished_date[2]+'/'+finished_date[0]+'/'+finished_date[1]+'T'+finished_at[0])
-      if finished_at[1].eql?('PM') and !finished_at[0].start_with?('12:')
-        finished_time += 12*60*60 
-      end
+      match = /This pipeline started at (.*)\. It failed after (.*) seconds at (.*)\. Check the Log/.match page_text
+      assert_not_nil(match, 'Did not find text - This pipeline started at . . . ')
 
-      # ran_for time display is of the format "4 minutes 52 seconds"
-      run_time = ran_for[-1].to_i
-      if ran_for[-2].andand.start_with?('minute')
-        run_time += ran_for[-3].to_i*60 if ran_for[-3]
-      elsif ran_for[-2].andand.start_with?('hour')
-        run_time += ran_for[-3].to_i*60*60 if ran_for[-3]
-      elsif ran_for[-2].andand.start_with?('day')
-        run_time += ran_for[-3].to_i*60*60*60 if ran_for[-3]
-      end
-      if ran_for[-4].andand.start_with?('hour')
-        run_time += ran_for[-5].to_i*60*60 if ran_for[-5]
-      elsif ran_for[-4].andand.start_with?('day')
-        run_time += ran_for[-5].to_i*60*60*60 if ran_for[-5]
-      end
-      run_time += ran_for[-7].to_i*60*60*60 if ran_for[-7]
+      start_at = match[1]
+      finished_at = match[3]
+      assert_not_nil(start_at, 'Did not find start_at time')
+      assert_not_nil(finished_at, 'Did not find finished_at time')
 
-      assert_equal(run_time, finished_time-start_time, "Time difference did not match for start_at #{start_at}, finished_at #{finished_at}, ran_for  #{ran_for}")
+      # start and finished time display is of the format '2:20 PM 10/20/2014'
+      start_time = DateTime.strptime(start_at, '%H:%M %p %m/%d/%Y').to_time
+      finished_time = DateTime.strptime(finished_at, '%H:%M %p %m/%d/%Y').to_time
+      assert_equal(run_time, finished_time-start_time,
+        "Time difference did not match for start_at #{start_at}, finished_at #{finished_at}, ran_for #{match[2]}")
     end
   end
-
 end