[ARVADOS] updated: d9df153743ada521cb42852ce2b4879b1981bbd9

[git at public.curoverse.com]

Summary of changes:
 .../pipeline_instances_controller_test.rb          | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

       via  d9df153743ada521cb42852ce2b4879b1981bbd9 (commit)
      from  dd0f2323bd5fbcef6a3921c45d6e3025a77d2e35 (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 d9df153743ada521cb42852ce2b4879b1981bbd9
Author: Tim Pierce <twp at curoverse.com>
Date:   Wed Oct 1 14:58:58 2014 -0400

    4000: update both functional tests.

diff --git a/apps/workbench/test/functional/pipeline_instances_controller_test.rb b/apps/workbench/test/functional/pipeline_instances_controller_test.rb
index f3e1068..90bccc0 100644
--- a/apps/workbench/test/functional/pipeline_instances_controller_test.rb
+++ b/apps/workbench/test/functional/pipeline_instances_controller_test.rb
@@ -104,8 +104,24 @@ class PipelineInstancesControllerTest < ActionController::TestCase
          session_for(:active))
     assert_response 302
     assert_not_nil assigns(:object)
+
+    # Component 'foo' has script parameters only in the pipeline instance.
+    # Component 'bar' is present only in the pipeline_template.
+    # Test that the copied pipeline instance includes parameters for
+    # component 'foo' from the source instance, and parameters for
+    # component 'bar' from the source template.
+    #
     assert_not_nil assigns(:object).components[:foo]
+    foo = assigns(:object).components[:foo]
+    assert_not_nil foo[:script_parameters]
+    assert_not_nil foo[:script_parameters][:input]
+    assert_equal 'foo instance input', foo[:script_parameters][:input][:title]
+
     assert_not_nil assigns(:object).components[:bar]
+    bar = assigns(:object).components[:bar]
+    assert_not_nil bar[:script_parameters]
+    assert_not_nil bar[:script_parameters][:input]
+    assert_equal 'bar template input', bar[:script_parameters][:input][:title]
   end
 
   test "copy pipeline instance on newer template works with script=use_same" do
@@ -122,11 +138,9 @@ class PipelineInstancesControllerTest < ActionController::TestCase
     assert_response 302
     assert_not_nil assigns(:object)
 
-    # Component 'foo' has script parameters only in the pipeline instance.
-    # Component 'bar' is present only in the pipeline_template.
-    # Test that the copied pipeline instance includes parameters for
-    # component 'foo' from the source instance, and parameters for
-    # component 'bar' from the source template.
+    # Test that relevant component parameters were copied from both
+    # the source instance and source template, respectively (see
+    # previous test)
     #
     assert_not_nil assigns(:object).components[:foo]
     foo = assigns(:object).components[:foo]

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


hooks/post-receive
--