[ARVADOS] updated: 0226ff322cc71b540f3ca7469ad1ecf1af95d8cd

[git at public.curoverse.com]

Summary of changes:
 .../functional/pipeline_instances_controller_test.rb  | 19 +++++--------------
 services/api/test/fixtures/pipeline_instances.yml     | 12 ++++++++++++
 2 files changed, 17 insertions(+), 14 deletions(-)

       via  0226ff322cc71b540f3ca7469ad1ecf1af95d8cd (commit)
      from  bd3979a09bd74b6311e9d242bc040915d417253f (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 0226ff322cc71b540f3ca7469ad1ecf1af95d8cd
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 25 15:31:26 2014 -0400

    3889: add fixture "pipeline_with_tagged_collection_input"

diff --git a/apps/workbench/test/functional/pipeline_instances_controller_test.rb b/apps/workbench/test/functional/pipeline_instances_controller_test.rb
index fbfbf34..8af7c1b 100644
--- a/apps/workbench/test/functional/pipeline_instances_controller_test.rb
+++ b/apps/workbench/test/functional/pipeline_instances_controller_test.rb
@@ -13,11 +13,6 @@ class PipelineInstancesControllerTest < ActionController::TestCase
     pi_uuid = assigns(:object).uuid
     assert_not_nil assigns(:object)
     yield pi_uuid, pt_fixture
-    post :destroy, {
-      id: pi_uuid,
-      format: :json
-    }
-    assert_response :success
   end
 
   test "pipeline instance components populated after create" do
@@ -28,15 +23,11 @@ class PipelineInstancesControllerTest < ActionController::TestCase
   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
+    # Make sure to pass in a tagged collection to test that part of the rendering behavior.
+    get(:show,
+        {id: api_fixture("pipeline_instances")["pipeline_with_tagged_collection_input"]["uuid"]},
+        session_for(:active))
+    assert_response :success
   end
 
   test "update script_parameters one at a time using merge param" do
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index 7bfc2e1..7acc707 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -62,3 +62,15 @@ components_is_jobspec:
         dataclass: Collection
         title: "Foo/bar pair"
         description: "Provide a collection containing at least two files."
+
+pipeline_with_tagged_collection_input:
+  name: pipeline_with_tagged_collection_input
+  state: Ready
+  uuid: zzzzz-d1hrv-1yfj61234abcdk3
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  created_at: <%= 3.1.minute.ago.to_s(:db) %>
+  components:
+    part-one:
+      script_parameters:
+        input:
+          value: zzzzz-4zz18-znfnqtbbv4spc3w

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


hooks/post-receive
--