Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New unit tests for ConcordiaUserAdmin and CampaignAdmin #2275

Merged
merged 9 commits into from
Feb 12, 2024
Merged

New unit tests for ConcordiaUserAdmin and CampaignAdmin #2275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4494690
Removed incorrect information from tests readme
joshuastegmaier Feb 5, 2024
91c3b25
Removed unused code rather than writing tests for it
joshuastegmaier Feb 7, 2024
11373ba
Added basic admin test framework, and added test for user admin
joshuastegmaier Feb 7, 2024
8dc9fd7
Added test for csv export in user admin
joshuastegmaier Feb 8, 2024
96b2329
Added basic test for excel user export
joshuastegmaier Feb 8, 2024
6cf8595
Added campaign admin test
joshuastegmaier Feb 9, 2024
bb79b96
Added test for campaign retirement
joshuastegmaier Feb 9, 2024
4995de1
Fixed Pipfile.lock conflict
joshuastegmaier Feb 9, 2024
e1b4546
Fixed error in export_csv test
joshuastegmaier Feb 9, 2024
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
1 change: 1 addition & 0 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ hiredis = "*"
pyasn1 = "*"
pyleniumio = "*"
django-maintenance-mode = "*"
faker = "*"

[dev-packages]
invoke = "*"
Expand Down
140 changes: 69 additions & 71 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 22 additions & 30 deletions concordia/admin/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
from django.utils.decorators import method_decorator
from django.utils.html import format_html
from django.views.decorators.csrf import csrf_protect
from django_admin_multiple_choice_list_filter.list_filters import (
MultipleChoiceListFilter,
)
from tabular_export.admin import export_to_csv_action, export_to_excel_action
from tabular_export.core import export_to_csv_response, flatten_queryset

Expand Down Expand Up @@ -63,10 +60,10 @@
AcceptedFilter,
AssetCampaignListFilter,
AssetCampaignStatusListFilter,
AssetProjectListFilter2,
AssetProjectListFilter,
ItemCampaignListFilter,
ItemCampaignStatusListFilter,
ItemProjectListFilter2,
ItemProjectListFilter,
OcrGeneratedFilter,
OcrOriginatedFilter,
ProjectCampaignListFilter,
Expand Down Expand Up @@ -94,26 +91,9 @@
SimpleContentBlockAdminForm,
)


class ProjectListFilter(MultipleChoiceListFilter):
title = "Project"

def lookups(self, request, model_admin):
choices = Project.objects.values_list("pk", "title")
return tuple(choices)


logger = logging.getLogger(__name__)


class AssetProjectListFilter(ProjectListFilter):
parameter_name = "item__project__in"


class ItemProjectListFilter(ProjectListFilter):
parameter_name = "project__in"


class ConcordiaUserAdmin(UserAdmin):
list_display = (
"username",
Expand Down Expand Up @@ -257,12 +237,24 @@ def get_urls(self):
return custom_urls + urls

@method_decorator(csrf_protect)
@method_decorator(permission_required("concordia.retire_campaign"))
@method_decorator(permission_required("concordia.delete_project"))
@method_decorator(permission_required("concordia.delete_item"))
@method_decorator(permission_required("concordia.delete_asset"))
@method_decorator(permission_required("concordia.delete_transcription"))
@method_decorator(permission_required("concordia.delete_import_item_asset"))
@method_decorator(
permission_required("concordia.retire_campaign", raise_exception=True)
)
@method_decorator(
permission_required("concordia.delete_project", raise_exception=True)
)
@method_decorator(
permission_required("concordia.delete_item", raise_exception=True)
)
@method_decorator(
permission_required("concordia.delete_asset", raise_exception=True)
)
@method_decorator(
permission_required("concordia.delete_transcription", raise_exception=True)
)
@method_decorator(
permission_required("concordia.delete_import_item_asset", raise_exception=True)
)
def retire(self, request, campaign_slug):
try:
campaign = Campaign.objects.filter(slug=campaign_slug)[0]
Expand Down Expand Up @@ -505,7 +497,7 @@ class ItemAdmin(admin.ModelAdmin):
"project__topics",
ItemCampaignStatusListFilter,
ItemCampaignListFilter,
ItemProjectListFilter2,
ItemProjectListFilter,
)

actions = (publish_item_action, unpublish_item_action)
Expand Down Expand Up @@ -598,7 +590,7 @@ class AssetAdmin(admin.ModelAdmin, CustomListDisplayFieldsMixin):
"item__project__topics",
AssetCampaignStatusListFilter,
AssetCampaignListFilter,
AssetProjectListFilter2,
AssetProjectListFilter,
"media_type",
)
actions = (
Expand Down
4 changes: 2 additions & 2 deletions concordia/admin/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,13 @@ def queryset(self, request, queryset):
return queryset


class ItemProjectListFilter2(CampaignProjectListFilter):
class ItemProjectListFilter(CampaignProjectListFilter):
parameter_name = "project__in"
related_filter_parameter = "project__campaign__id__exact"
project_ref = "project_id"


class AssetProjectListFilter2(CampaignProjectListFilter):
class AssetProjectListFilter(CampaignProjectListFilter):
parameter_name = "item__project__in"
related_filter_parameter = "item__project__campaign__id__exact"
project_ref = "item__project_id"
Expand Down
Loading