[ARVADOS] updated: 2.1.0-44-gbdc3e037a

Git user git at public.arvados.org
Mon Nov 16 18:36:01 UTC 2020


Summary of changes:
 services/api/app/controllers/arvados/v1/groups_controller.rb      | 2 +-
 services/api/test/functional/arvados/v1/groups_controller_test.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

       via  bdc3e037a13d31848886d1f114f72fd6659cdd83 (commit)
      from  591fd6a07919d59d25a0b360a23e61e508403b48 (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 bdc3e037a13d31848886d1f114f72fd6659cdd83
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Fri Nov 13 15:44:43 2020 -0500

    17111: Deselect unsigned_manifest_text by default in groups#contents.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index 3e238a5ad..732d102be 100644
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -268,7 +268,7 @@ class Arvados::V1::GroupsController < ApplicationController
       @select = nil
       where_conds = filter_by_owner
       if klass == Collection
-        @select = klass.selectable_attributes - ["manifest_text"]
+        @select = klass.selectable_attributes - ["manifest_text", "unsigned_manifest_text"]
       elsif klass == Group
         where_conds = where_conds.merge(group_class: "project")
       end
diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index f413188b5..b87d30d28 100644
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -316,7 +316,7 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
     end
   end
 
-  test "Collection contents don't include manifest_text" do
+  test "Collection contents don't include manifest_text or unsigned_manifest_text" do
     authorize_with :active
     get :contents, params: {
       id: groups(:aproject).uuid,
@@ -327,7 +327,9 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
     refute(json_response["items"].any? { |c| not c["portable_data_hash"] },
            "response included an item without a portable data hash")
     refute(json_response["items"].any? { |c| c.include?("manifest_text") },
-           "response included an item with a manifest text")
+           "response included an item with manifest_text")
+    refute(json_response["items"].any? { |c| c.include?("unsigned_manifest_text") },
+           "response included an item with unsigned_manifest_text")
   end
 
   test 'get writable_by list for owned group' do

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list