4015: fix pipeline instance tests

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 4e53db7783ffdfc560ccb0011a70244ec41737bd..c537d3535d374f30070ed8c02b81721ede2502cc 100644 (file)
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -131,36 +131,38 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     template = api_fixture('pipeline_templates')['simple_pipeline']
 
     visit '/pipeline_templates'
-    within('tr', text: 'Pipeline Template With Collection Input') do
+    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: 'A Project').click
+      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.foo.template.input/
+      a[:href] =~ /Choose.a.dataset.for.simple.pipeline.input/
     }
     assert_not_empty input
     input.first.click
 
     # Select a collection
-    col = api_fixture('collections')['foo_collection_in_aproject']
+    col = api_fixture('collections')['collection_input_for_simple_pipeline']
     within('.modal-dialog') do
-      find('div', text: col['name']).click
+      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']['part-one']['script_parameters']['input']
+    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']

diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index c481424d6d29160778ee7843f2da9bb4a65994a8..b233418e89d4c5e5b42f73553bc5d0c9226c5e7d 100644 (file)
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -123,6 +123,16 @@ empty:
   manifest_text: ""
   name: empty_collection
 
+collection_input_for_simple_pipeline:
+  uuid: zzzzz-4zz18-c5hn44njgog4hhm
+  portable_data_hash: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45
+  owner_uuid: zzzzz-j7d0g-v955i6s2oi1cbso
+  created_at: 2014-10-23 17:32:02 -0400
+  modified_at: 2014-10-23 17:32:02 -0400
+  updated_at: 2014-10-23 17:32:02 -0400
+  manifest_text: ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo\n"
+  name: collection input for simple pipeline
+
 foo_collection_in_aproject:
   uuid: zzzzz-4zz18-fy296fx3hot09f7
   portable_data_hash: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45