3824: Merge branch 'master' into 3824-crunch-container-setup

[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 c537d3535d374f30070ed8c02b81721ede2502cc..ee4a660f550a7e4c064b5adeaf7851d54eb1412e 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')
 
@@ -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
@@ -367,17 +348,20 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
       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
+      assert_not_nil(match, 'Did not find text - This pipeline started at . . . ')
 
       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')
 
       # start and finished time display is of the format '2:20 PM 10/20/2014'
-      start_time = DateTime.strptime(start_at, '%I:%M %p %m/%d/%Y').to_time
-      finished_time = DateTime.strptime(finished_at, '%I:%M %p %m/%d/%Y').to_time
-
+      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]}")
+        "Time difference did not match for start_at #{start_at}, finished_at #{finished_at}, ran_for #{match[2]}")
     end
   end
 end