[ARVADOS] updated: 7fbcd989af9949b11ddfec0c9ebfaa96a655eef4

[git at public.curoverse.com]

Summary of changes:
 .../pipeline_instances_controller_test.rb          |   18 +++++++++++++++---
 services/api/test/fixtures/links.yml               |   14 ++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

       via  7fbcd989af9949b11ddfec0c9ebfaa96a655eef4 (commit)
      from  c3457ad20bfd00c99facef396f1dbdbcbdbad241 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7fbcd989af9949b11ddfec0c9ebfaa96a655eef4
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Apr 25 17:33:32 2014 -0400

    workbench: Add pipeline instance tag render test.
    
    Sasha just tickled this, so we want to prevent future recurrences.

diff --git a/apps/workbench/test/functional/pipeline_instances_controller_test.rb b/apps/workbench/test/functional/pipeline_instances_controller_test.rb
index 77da2ad..c04b5b1 100644
--- a/apps/workbench/test/functional/pipeline_instances_controller_test.rb
+++ b/apps/workbench/test/functional/pipeline_instances_controller_test.rb
@@ -1,12 +1,12 @@
 require 'test_helper'
 
 class PipelineInstancesControllerTest < ActionController::TestCase
-  def create_instance_long_enough_to
+  def create_instance_long_enough_to(instance_attrs={})
     pt_fixture = api_fixture('pipeline_templates')['two_part']
     post :create, {
-      pipeline_instance: {
+      pipeline_instance: instance_attrs.merge({
         pipeline_template_uuid: pt_fixture['uuid']
-      },
+      }),
       format: :json
     }, session_for(:active)
     assert_response :success
@@ -27,6 +27,18 @@ class PipelineInstancesControllerTest < ActionController::TestCase
     end
   end
 
+  test "can render pipeline instance with tagged collections" do
+    # Make sure to pass in a tagged collection to test that part of the
+    # rendering behavior.
+    attrs = {components: {'part-one' => {script_parameters: {input:
+            {value: api_fixture('collections')['foo_file']['uuid']}
+            }}}}
+    create_instance_long_enough_to(attrs) do |new_instance_uuid, template_fixture|
+      get(:show, {id: new_instance_uuid}, session_for(:active))
+      assert_response :success
+    end
+  end
+
   test "update script_parameters one at a time using merge param" do
     create_instance_long_enough_to do |new_instance_uuid, template_fixture|
       post :update, {
diff --git a/services/api/test/fixtures/links.yml b/services/api/test/fixtures/links.yml
index ac1494b..5b89015 100644
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@ -303,3 +303,17 @@ specimen_is_in_two_folders:
   link_class: permission
   name: can_manage
   properties: {}
+
+foo_collection_tag:
+  uuid: zzzzz-o0j2j-eedahfaho8aphiv
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  created_at: 2014-04-21 15:37:48 -0400
+  modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+  modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  modified_at: 2014-04-21 15:37:48 -0400
+  updated_at: 2014-04-21 15:37:48 -0400
+  tail_uuid: ~
+  head_uuid: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45
+  link_class: tag
+  name: foo_tag
+  properties: {}

-----------------------------------------------------------------------


hooks/post-receive
--