[ARVADOS] created: 140012f16cc5945a8c469db3e11f13cc4493cc22
git at public.curoverse.com
git at public.curoverse.com
Thu Oct 23 17:04:22 EDT 2014
at 140012f16cc5945a8c469db3e11f13cc4493cc22 (commit)
commit 140012f16cc5945a8c469db3e11f13cc4493cc22
Author: Tim Pierce <twp at curoverse.com>
Date: Thu Oct 23 17:00:54 2014 -0400
4015: test recording collection hashes for pipeline inputs
diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index a941389..4e53db7 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -117,12 +117,55 @@ 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 without 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: 'Pipeline Template With Collection Input') 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('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/
+ }
+ assert_not_empty input
+ input.first.click
+
+ # Select a collection
+ col = api_fixture('collections')['foo_collection_in_aproject']
+ within('.modal-dialog') do
+ find('div', 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.
+ 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']
+ end
+
test 'view pipeline with job and see graph' do
visit page_with_token('active_trustedclient')
diff --git a/services/api/test/fixtures/pipeline_templates.yml b/services/api/test/fixtures/pipeline_templates.yml
index 31ebb97..2f1e43e 100644
--- a/services/api/test/fixtures/pipeline_templates.yml
+++ b/services/api/test/fixtures/pipeline_templates.yml
@@ -1,3 +1,23 @@
+simple_pipeline:
+ uuid: zzzzz-p5p6p-hrfcwbrc62fj0kq
+ owner_uuid: zzzzz-j7d0g-v955i6s2oi1cbso
+ created_at: 2014-10-23 16:46:27 -0400
+ updated_at: 2014-10-23 16:46:27 -0400
+ modified_at: 2014-10-23 16:46:27 -0400
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ name: Pipeline Template With Collection Input
+ components:
+ foo_component:
+ script: foo
+ script_version: master
+ script_parameters:
+ input:
+ required: true
+ dataclass: Collection
+ title: "simple pipeline input"
+ description: "Collection input for simple pipeline"
+
two_part:
uuid: zzzzz-p5p6p-aox0k0ofxrystgw
owner_uuid: zzzzz-j7d0g-v955i6s2oi1cbso
@@ -88,6 +108,7 @@ new_pipeline_template:
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
created_at: 2014-09-14 12:00:00
modified_at: 2014-09-16 12:00:00
+ name: Pipeline Template Newer Than Instance
components:
foo:
script: foo
commit 4a774fdb7a95a241d4b95649ea57b505784f3362
Author: Tim Pierce <twp at curoverse.com>
Date: Wed Oct 22 12:44:53 2014 -0400
4015: use portable_data_hash to populate chooser
diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index a618d43..3d34c7b 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -64,7 +64,8 @@ class PipelineInstancesController < ApplicationController
if component[:script_parameters]
component[:script_parameters].each do |param, value_info|
if value_info.is_a? Hash
- if resource_class_for_uuid(value_info[:value]) == Link
+ value_info_class = resource_class_for_uuid(value_info[:value])
+ if value_info_class == Link
# Use the link target, not the link itself, as script
# parameter; but keep the link info around as well.
link = Link.find value_info[:value]
@@ -76,6 +77,15 @@ class PipelineInstancesController < ApplicationController
value_info[:link_uuid] = nil
value_info[:link_name] = nil
end
+ if value_info_class == Collection
+ # to ensure reproducibility, the script_parameter for a
+ # collection should be the portable_data_hash
+ # keep the collection name and uuid for human-readability
+ obj = Collection.find value_info[:value]
+ value_info[:value] = obj.portable_data_hash
+ value_info[:selection_uuid] = obj.uuid
+ value_info[:selection_name] = obj.name
+ end
end
end
end
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 66b7ed6..cfe7f19 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -269,6 +269,8 @@ module ApplicationHelper
display_value = link.name
elsif value_info[:link_name]
display_value = value_info[:link_name]
+ elsif value_info[:selection_name]
+ display_value = value_info[:selection_name]
end
end
if (attr == :components) and (subattr.size > 2)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list