Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions codecov_auth/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -645,18 +645,7 @@
TaskService().delete_owner(ownerid=obj.ownerid)

def get_deleted_objects(self, objs, request):
(
deleted_objects,
model_count,
perms_needed,
protected,
) = super().get_deleted_objects(objs, request)

if request.user and request.user.is_superuser:
perms_needed = set()

deleted_objects = ()
return deleted_objects, model_count, perms_needed, protected
return [], {}, set(), []

Check warning on line 648 in codecov_auth/admin.py

View check run for this annotation

Codecov Notifications / codecov/patch

codecov_auth/admin.py#L648

Added line #L648 was not covered by tests

def save_related(self, request: HttpRequest, form, formsets, change: bool) -> None:
if formsets:
Expand Down
20 changes: 0 additions & 20 deletions codecov_auth/tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,26 +125,6 @@ def test_delete_model(self, delete_mock):
self.owner_admin.delete_model(MagicMock(), user_to_delete)
delete_mock.assert_called_once_with(ownerid=ownerid)

@patch("codecov_auth.admin.admin.ModelAdmin.get_deleted_objects")
def test_confirmation_deleted_objects(self, mocked_deleted_objs):
user_to_delete = OwnerFactory(plan=DEFAULT_FREE_PLAN)
deleted_objs = [
'Owner: <a href="/admin/codecov_auth/owner/{}/change/">{};</a>'.format(
user_to_delete.ownerid, user_to_delete
)
]
mocked_deleted_objs.return_value = deleted_objs, {"owners": 1}, set(), []

(
deleted_objects,
model_count,
perms_needed,
protected,
) = self.owner_admin.get_deleted_objects([user_to_delete], MagicMock())

mocked_deleted_objs.assert_called_once()
assert deleted_objects == ()

@patch("codecov_auth.admin.admin.ModelAdmin.log_change")
def test_prev_and_new_values_in_log_entry(self, mocked_super_log_change):
owner = OwnerFactory(staff=True, plan=DEFAULT_FREE_PLAN)
Expand Down
3 changes: 3 additions & 0 deletions core/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
def delete_model(self, request, obj) -> None:
TaskService().flush_repo(repository_id=obj.repoid)

def get_deleted_objects(self, objs, request):
return [], {}, set(), []

Check warning on line 108 in core/admin.py

View check run for this annotation

Codecov Notifications / codecov/patch

core/admin.py#L108

Added line #L108 was not covered by tests


@admin.register(Pull)
class PullsAdmin(AdminMixin, admin.ModelAdmin):
Expand Down
Loading