[ARVADOS] updated: 5ff990155f06109c55bbb832a8dd670265d3f3d1

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |  2 +-
 apps/workbench/Gemfile.lock                        |  4 +-
 .../app/controllers/collections_controller.rb      |  9 +--
 apps/workbench/app/models/collection.rb            | 14 ++--
 apps/workbench/config/application.default.yml      | 13 ++--
 apps/workbench/test/diagnostics/pipeline_test.rb   | 32 ++++----
 sdk/ruby/lib/arvados/keep.rb                       | 77 ++++++++++++++++---
 sdk/ruby/test/test_keep_manifest.rb                | 87 +++++++++++++++++-----
 services/api/Gemfile                               |  2 +-
 services/api/Gemfile.lock                          |  4 +-
 services/api/app/models/collection.rb              |  9 +--
 11 files changed, 179 insertions(+), 74 deletions(-)

       via  5ff990155f06109c55bbb832a8dd670265d3f3d1 (commit)
       via  72da0be3dc47515537b89f132b0f3995b6ab132e (commit)
       via  bafb417c531d6094697a13a7465313d1cc7c0bc9 (commit)
      from  bdaaaf2330d43200f5e9f14172ca0591d7314aaf (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 5ff990155f06109c55bbb832a8dd670265d3f3d1
Merge: 72da0be bafb417
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 10 13:47:08 2014 -0400

    Merge branch 'master' into 2761-diagnostic-suite


commit 72da0be3dc47515537b89f132b0f3995b6ab132e
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 10 13:45:47 2014 -0400

    2761: test updates to be able to handle multiple inputs

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 510dedb..2b1a49b 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -150,15 +150,18 @@ common:
   # Configure test user tokens as "diagnostics_testing_user_tokens".
   #   At this time the tests need an "active" user token.
   # Also, configure the pipelines to be executed as "diagnostics_testing_pipeline_fields".
-  # For each of the pipeline fields:
-  #   You 
+  # For each of the pipelines identified by the name of your choice
+  #     ("tutorial pipeline" and "tutorial pipeline 2" in this sample):
+  #   template_uuid: is the uuid of the template to be executed
+  #   input_paths: an array of inputs for the pipeline. Use either a collection's "uuid"
+  #     or a file's "uuid/file_name" path in this array. If the pipeline does not require
+  #     any inputs, this can be omitted. 
   #diagnostics_testing_user_tokens:
   #  active: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
-  #  admin: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
   #diagnostics_testing_pipeline_fields:
   #  tutorial pipeline:
   #    template_uuid: zzzzz-p5p6p-rxj8d71854j9idn
-  #    input_names: ['Diagnostic testing - Tutorial pipeline input']
+  #    input_paths: [zzzzz-4zz18-u9pmni8msw9zm9n]
   #  tutorial pipeline 2:
   #    template_uuid: zzzzz-p5p6p-kfwus81of6y3ezs
-  #    input_names: ['Diagnostic testing - Tutorial pipeline input']
+  #    input_paths: [zzzzz-4zz18-u9pmni8msw9zm9n]
diff --git a/apps/workbench/test/diagnostics/pipeline_test.rb b/apps/workbench/test/diagnostics/pipeline_test.rb
index 126b6a6..2f20b00 100644
--- a/apps/workbench/test/diagnostics/pipeline_test.rb
+++ b/apps/workbench/test/diagnostics/pipeline_test.rb
@@ -32,33 +32,35 @@ class PipelineTest < DiagnosticsTest
         find('button', text: 'Choose').click
       end
 
-      if pipeline_config['input_names'].andand.any?
+      # Choose input for the pipeline
+      if pipeline_config['input_paths'].andand.any?
         # This pipeline needs input. So, Run should be disabled
         page.assert_selector 'a.disabled,button.disabled', text: 'Run'
 
-        inputs = page.all('.btn', text: 'Choose')
-        inputs.each_with_index do |input, index|
-          # Choose input for the pipeline
-          input.click
+        inputs_needed = page.all('.btn', text: 'Choose')
+        inputs_needed.each_with_index do |input_needed, index|
+          input_needed.click
           within('.modal-dialog') do
-            input_found = page.has_text?(pipeline_config['input_names'][index])
-            if input_found
-              find('.selectable', text: pipeline_config['input_names'][index]).click
+            look_for = pipeline_config['input_paths'][index]
+            found = page.has_text?(look_for)
+            if found
+              find('.selectable').click
             else
-              fill_in('Search', with: pipeline_config['input_names'][index], exact: true)
+              fill_in('Search', with: look_for, exact: true)
               wait_for_ajax
-              find('.selectable', text: pipeline_config['input_names'][index]).click
+              find('.selectable').click
             end
             find('button', text: 'OK').click
             wait_for_ajax
           end
-
-          # Run this pipeline instance
-          find('a,button', text: 'Run').click
-          # Pipeline is running. We have a "Stop" button instead now.
-          page.assert_selector 'a,button', text: 'Stop'
         end
       end
+
+      # Run this pipeline instance
+      find('a,button', text: 'Run').click
+
+      # Pipeline is running. We have a "Stop" button instead now.
+      page.assert_selector 'a,button', text: 'Stop'
     end
   end
 

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


hooks/post-receive
--