Skip to content

Commit 9b6a491

Browse files
refactor: remove unused code (#5092)
- func readable_route_dataset is not used
1 parent 9890107 commit 9b6a491

2 files changed

Lines changed: 0 additions & 58 deletions

File tree

lib/cloud_controller/permissions.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,6 @@ def can_read_from_isolation_segment?(isolation_segment)
213213
can_read_globally? || readable_org_guids_query.where(isolation_segment_models: isolation_segment).any?
214214
end
215215

216-
def readable_route_dataset
217-
if can_read_globally?
218-
VCAP::CloudController::Route.dataset
219-
else
220-
VCAP::CloudController::Route.user_visible(@user, can_read_globally?)
221-
end
222-
end
223-
224216
def readable_services_space_guids
225217
if can_read_secrets_globally?
226218
VCAP::CloudController::Space.select_map(:guid)

spec/unit/lib/cloud_controller/permissions_spec.rb

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -902,56 +902,6 @@ module VCAP::CloudController
902902
end
903903
end
904904

905-
describe '#readable_route_dataset' do
906-
it 'returns all the routes for admins' do
907-
user = set_current_user_as_admin
908-
subject = Permissions.new(user)
909-
910-
org1 = Organization.make
911-
space1 = Space.make(organization: org1)
912-
route1 = Route.make(space: space1)
913-
route2 = Route.make(space: space1)
914-
org2 = Organization.make
915-
space2 = Space.make(organization: org2)
916-
route3 = Route.make(space: space2)
917-
918-
dataset = subject.readable_route_dataset
919-
920-
expect(dataset.first(guid: route1.guid)).to be_present
921-
expect(dataset.first(guid: route2.guid)).to be_present
922-
expect(dataset.first(guid: route3.guid)).to be_present
923-
end
924-
925-
it 'returns routes where the user has an appropriate org membership' do
926-
manager_org = Organization.make
927-
manager_space = Space.make(organization: manager_org)
928-
manager_route = Route.make(space: manager_space)
929-
manager_org.add_manager(user)
930-
931-
auditor_org = Organization.make
932-
auditor_space = Space.make(organization: auditor_org)
933-
auditor_route = Route.make(space: auditor_space)
934-
auditor_org.add_auditor(user)
935-
936-
billing_manager_org = Organization.make
937-
billing_manager_space = Space.make(organization: billing_manager_org)
938-
billing_manager_route = Route.make(space: billing_manager_space)
939-
billing_manager_org.add_billing_manager(user)
940-
941-
member_org = Organization.make
942-
member_space = Space.make(organization: member_org)
943-
member_route = Route.make(space: member_space)
944-
member_org.add_user(user)
945-
946-
dataset = permissions.readable_route_dataset
947-
948-
expect(dataset.first(guid: manager_route.guid)).to be_present
949-
expect(dataset.first(guid: auditor_route.guid)).to be_present
950-
expect(dataset.first(guid: billing_manager_route.guid)).to be_nil
951-
expect(dataset.first(guid: member_route.guid)).to be_nil
952-
end
953-
end
954-
955905
describe '#can_read_route?' do
956906
it 'returns true if user is an admin' do
957907
set_current_user(user, { admin: true })

0 commit comments

Comments
 (0)