X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3bdc5e4dee5990218885f68a3463c230135396ea..39507a40922e11e6863e4dd788ad3231e6fb3224:/services/api/test/functional/arvados/v1/groups_controller_test.rb 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 c4e22f166b..59dcd2b572 100644 --- a/services/api/test/functional/arvados/v1/groups_controller_test.rb +++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb @@ -16,11 +16,11 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase test "get list of projects" do authorize_with :active - get :index, filters: [['group_class', 'in', ['project', 'folder']]], format: :json + get :index, filters: [['group_class', '=', 'project']], format: :json assert_response :success group_uuids = [] json_response['items'].each do |group| - assert_includes ['folder', 'project'], group['group_class'] + assert_equal 'project', group['group_class'] group_uuids << group['uuid'] end assert_includes group_uuids, groups(:aproject).uuid @@ -31,11 +31,11 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase test "get list of groups that are not projects" do authorize_with :active - get :index, filters: [['group_class', '=', nil]], format: :json + get :index, filters: [['group_class', '!=', 'project']], format: :json assert_response :success group_uuids = [] json_response['items'].each do |group| - assert_equal nil, group['group_class'] + assert_not_equal 'project', group['group_class'] group_uuids << group['uuid'] end assert_not_includes group_uuids, groups(:aproject).uuid @@ -90,24 +90,63 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase check_project_contents_response end - [false, true].each do |include_linked| - test "list objects across projects, include_linked=#{include_linked}" do - authorize_with :project_viewer - get :contents, { - format: :json, - include_linked: include_linked, - filters: [['uuid', 'is_a', 'arvados#specimen']] - } - assert_response :success - found_uuids = json_response['items'].collect { |i| i['uuid'] } - [[:in_aproject, true], - [:in_asubproject, true], - [:owned_by_private_group, false]].each do |specimen_fixture, should_find| - if should_find - assert_includes found_uuids, specimens(specimen_fixture).uuid, "did not find specimen fixture '#{specimen_fixture}'" - else - refute_includes found_uuids, specimens(specimen_fixture).uuid, "found specimen fixture '#{specimen_fixture}'" - end + test "list objects across projects" do + authorize_with :project_viewer + get :contents, { + format: :json, + filters: [['uuid', 'is_a', 'arvados#specimen']] + } + assert_response :success + found_uuids = json_response['items'].collect { |i| i['uuid'] } + [[:in_aproject, true], + [:in_asubproject, true], + [:owned_by_private_group, false]].each do |specimen_fixture, should_find| + if should_find + assert_includes found_uuids, specimens(specimen_fixture).uuid, "did not find specimen fixture '#{specimen_fixture}'" + else + refute_includes found_uuids, specimens(specimen_fixture).uuid, "found specimen fixture '#{specimen_fixture}'" + end + end + end + + test "list objects in home project" do + authorize_with :active + get :contents, { + format: :json, + id: users(:active).uuid + } + assert_response :success + found_uuids = json_response['items'].collect { |i| i['uuid'] } + assert_includes found_uuids, specimens(:owned_by_active_user).uuid, "specimen did not appear in home project" + refute_includes found_uuids, specimens(:in_asubproject).uuid, "specimen appeared unexpectedly in home project" + end + + test "user with project read permission can see project collections" do + authorize_with :project_viewer + get :contents, { + id: groups(:asubproject).uuid, + format: :json, + } + ids = json_response['items'].map { |item| item["uuid"] } + assert_includes ids, collections(:baz_file_in_asubproject).uuid + end + + test 'list objects across multiple projects' do + authorize_with :project_viewer + get :contents, { + format: :json, + include_linked: false, + filters: [['uuid', 'is_a', 'arvados#specimen']] + } + assert_response :success + found_uuids = json_response['items'].collect { |i| i['uuid'] } + [[:in_aproject, true], + [:in_asubproject, true], + [:owned_by_private_group, false]].each do |specimen_fixture, should_find| + if should_find + assert_includes found_uuids, specimens(specimen_fixture).uuid, "did not find specimen fixture '#{specimen_fixture}'" + else + refute_includes found_uuids, specimens(specimen_fixture).uuid, "found specimen fixture '#{specimen_fixture}'" end end end @@ -139,8 +178,8 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase authorize_with :project_viewer @controller = Arvados::V1::LinksController.new post :update, { - id: links(:job_name_in_aproject).uuid, - link: {name: "Denied test name"}, + id: jobs(:running).uuid, + name: "Denied test name", } assert_includes(403..404, response.status) end @@ -149,7 +188,7 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase @controller = Arvados::V1::PipelineTemplatesController.new authorize_with :project_viewer post :update, { - id: links(:template_name_in_aproject).head_uuid, + id: pipeline_templates(:two_part).uuid, pipeline_template: { owner_uuid: users(:project_viewer).uuid, } @@ -200,69 +239,31 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase assert_equal 0, json_response['items_available'] end - test 'get group-owned objects without include_linked' do - unexpected_uuid = specimens(:in_aproject_linked_from_asubproject).uuid - authorize_with :active - get :contents, { - id: groups(:asubproject).uuid, - format: :json, - } - assert_response :success - uuids = json_response['items'].collect { |i| i['uuid'] } - assert_equal nil, uuids.index(unexpected_uuid) - end - - test 'get group-owned objects with include_linked' do - expected_uuid = specimens(:in_aproject_linked_from_asubproject).uuid - authorize_with :active - get :contents, { - id: groups(:asubproject).uuid, - include_linked: true, - format: :json, - } - assert_response :success - uuids = json_response['items'].collect { |i| i['uuid'] } - assert_includes uuids, expected_uuid, "Did not get #{expected_uuid}" - - expected_name = links(:specimen_is_in_two_projects).name - found_specimen_name = false - assert(json_response['links'].any?, - "Expected a non-empty array of links in response") - json_response['links'].each do |link| - if link['head_uuid'] == expected_uuid - if link['name'] == expected_name - found_specimen_name = true - end - end - end - assert(found_specimen_name, - "Expected to find name '#{expected_name}' in response") - end - - [false, true].each do |inc_ind| - test "get all pages of group-owned #{'and -linked ' if inc_ind}objects" do + [0, 5, 10, 15, 20].each do |offset| + test "get pages of group-owned objects with offset #{offset}" do authorize_with :active limit = 5 - offset = 0 items_available = nil uuid_received = {} owner_received = {} - while true - # Behaving badly here, using the same controller multiple - # times within a test. - @json_response = nil - get :contents, { - id: groups(:aproject).uuid, - include_linked: inc_ind, - limit: limit, - offset: offset, - format: :json, - } - assert_response :success + + @json_response = nil + get :contents, { + id: groups(:aproject).uuid, + limit: limit, + offset: offset, + format: :json, + } + assert_response :success + items_available ||= json_response['items_available'] + if offset >= items_available + assert_equal(0, json_response['items'].count, + "items_available=#{items_available} but received #{json_response['items']} "\ + "items with offset=#{offset}") + else assert_operator(0, :<, json_response['items'].count, - "items_available=#{items_available} but received 0 "\ + "items_available=#{items_available} but received "\ "items with offset=#{offset}") - items_available ||= json_response['items_available'] assert_equal(items_available, json_response['items_available'], "items_available changed between page #{offset/limit} "\ "and page #{1+offset/limit}") @@ -273,15 +274,8 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase uuid_received[uuid] = true owner_received[item['owner_uuid']] = true offset += 1 - if not inc_ind - assert_equal groups(:aproject).uuid, item['owner_uuid'] - end + assert_equal groups(:aproject).uuid, item['owner_uuid'] end - break if offset >= items_available - end - if inc_ind - assert_operator 0, :<, (json_response.keys - [users(:active).uuid]).count, - "Set include_linked=true but did not receive any non-owned items" end end end @@ -320,8 +314,9 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase format: :json } assert_response :success - assert_nil(json_response['writable_by'], - "Should not receive uuid list in 'writable_by' field") + assert_equal([json_response['owner_uuid']], + json_response['writable_by'], + "Should only see owner_uuid in 'writable_by' field") end test 'get writable_by list by admin user' do