X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8886788e82b7e45c9211f6bf3a23c601ed0b88c1..0eb72b526bf8bbb011551ecf019f604e17a534f1:/apps/workbench/test/controllers/projects_controller_test.rb diff --git a/apps/workbench/test/controllers/projects_controller_test.rb b/apps/workbench/test/controllers/projects_controller_test.rb index d0b1e287ff..f45f178395 100644 --- a/apps/workbench/test/controllers/projects_controller_test.rb +++ b/apps/workbench/test/controllers/projects_controller_test.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + require 'test_helper' require 'helpers/share_object_helper' @@ -101,8 +105,9 @@ class ProjectsControllerTest < ActionController::TestCase end test "project admin can remove collections from the project" do - # Deleting an object that supports 'expires_at' should make it - # completely inaccessible to API queries, not simply moved out of the project. + # Deleting an object that supports 'trash_at' should make it + # completely inaccessible to API queries, not simply moved out of + # the project. coll_key = "collection_to_remove_from_subproject" coll_uuid = api_fixture("collections")[coll_key]["uuid"] delete(:remove_item, @@ -116,12 +121,12 @@ class ProjectsControllerTest < ActionController::TestCase use_token :subproject_admin assert_raise ArvadosApiClient::NotFoundException do - Collection.find(coll_uuid) + Collection.find(coll_uuid, cache: false) end end test "project admin can remove items from project other than collections" do - # An object which does not have an expired_at field (e.g. Specimen) + # An object which does not have an trash_at field (e.g. Specimen) # should be implicitly moved to the user's Home project when removed. specimen_uuid = api_fixture('specimens', 'in_asubproject')['uuid'] delete(:remove_item,