[ARVADOS] updated: 1.3.0-882-g28ca19d77

Git user git at public.curoverse.com
Mon May 13 14:42:15 UTC 2019


Summary of changes:
 .../app/controllers/pipeline_instances_controller.rb     |  2 +-
 .../test/integration/pipeline_instances_test.rb          | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

       via  28ca19d7742733ebd1429ab6daefab38d90753ad (commit)
       via  21bb2196ecfaba6ec1e7162b8e8901988945daf1 (commit)
      from  ad25d712525293ce4f95f5a059b390036ec60dc3 (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 28ca19d7742733ebd1429ab6daefab38d90753ad
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon May 13 11:41:38 2019 -0300

    14988: Fixes pipeline instance controller's param handling.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index ab0e55b22..26a9f85d4 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -67,7 +67,7 @@ class PipelineInstancesController < ApplicationController
   end
 
   def update
-    @updates ||= params[@object.class.to_s.underscore.singularize.to_sym]
+    @updates ||= params.to_unsafe_hash[@object.class.to_s.underscore.singularize.to_sym]
     if (components = @updates[:components])
       components.each do |cname, component|
         if component[:script_parameters]

commit 21bb2196ecfaba6ec1e7162b8e8901988945daf1
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon May 13 10:56:21 2019 -0300

    14988: Fixes assert_equal param ordering for proper error messages.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 47e385a4e..801609fbb 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -140,9 +140,9 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     click_link 'API response'
     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'], collection['portable_data_hash']
-    assert_equal input_params['selection_name'], collection['name']
-    assert_equal input_params['selection_uuid'], collection['uuid']
+    assert_equal collection['portable_data_hash'], input_params['value']
+    assert_equal collection['name'], input_params['selection_name']
+    assert_equal collection['uuid'], input_params['selection_uuid']
 
     # "Run" button is now enabled
     page.assert_no_selector 'a.disabled,button.disabled', text: 'Run'
@@ -445,13 +445,13 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
     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['selection_uuid'], collection['uuid'], "Not found expected input param uuid")
+    assert_equal(collection['uuid'], input_params['selection_uuid'], "Not found expected input param uuid")
     if choose_file
-      assert_equal(input_params['value'], collection['portable_data_hash']+'/foo', "Not found expected input file param value")
-      assert_equal(input_params['selection_name'], collection['name']+'/foo', "Not found expected input file param name")
+      assert_equal(collection['portable_data_hash']+'/foo', input_params['value'], "Not found expected input file param value")
+      assert_equal(collection['name']+'/foo', input_params['selection_name'], "Not found expected input file param name")
     else
-      assert_equal(input_params['value'], collection['portable_data_hash'], "Not found expected input param value")
-      assert_equal(input_params['selection_name'], collection['name'], "Not found expected input selection name")
+      assert_equal(collection['portable_data_hash'], input_params['value'], "Not found expected input param value")
+      assert_equal(collection['name'], input_params['selection_name'], "Not found expected input selection name")
     end
 
     # "Run" button present and enabled

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list