Skip to content

Commit cb79e0f

Browse files
Updated tests and removed more refrences to the old tests
have also added migrations
1 parent 3b548d8 commit cb79e0f

File tree

8 files changed

+93
-51
lines changed

8 files changed

+93
-51
lines changed

accounts/forms.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,6 @@ def clean(self):
6464
raise forms.ValidationError(_("Staff users cannot be deleted"))
6565
return cleaned_data
6666

67-
def add_errors_from_protectederror(self, exception):
68-
"""
69-
Convert the given ProtectedError exception object into validation
70-
errors on the instance.
71-
"""
72-
self.add_error(None, _("User has protected data and cannot be deleted"))
73-
7467
@transaction.atomic()
7568
def delete(self):
7669
"""

accounts/tests.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -218,17 +218,6 @@ def test_deletion_staff_forbidden(self):
218218
form = self.create_user_and_form(is_staff=True)
219219
self.assertFormError(form, None, ["Staff users cannot be deleted"])
220220

221-
def test_user_with_protected_data(self):
222-
form = self.create_user_and_form()
223-
form.user.boardmember_set.create(
224-
office=foundationmodels.Office.objects.create(name="test"),
225-
term=foundationmodels.Term.objects.create(year=2000),
226-
)
227-
form.delete()
228-
self.assertFormError(
229-
form, None, ["User has protected data and cannot be deleted"]
230-
)
231-
232221
def test_form_delete_method_requires_valid_form(self):
233222
form = self.create_user_and_form(is_staff=True)
234223
self.assertRaises(form.InvalidFormError, form.delete)

foundation/admin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from django.contrib import admin
2-
from django.utils.text import slugify
32
from django.utils.translation import gettext as _
43

54
from . import models
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# Generated by Django 5.2 on 2025-09-23 05:51
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('foundation', '0007_boardmember_account_protect'),
10+
]
11+
12+
operations = [
13+
migrations.RemoveField(
14+
model_name='approvedcorporatemember',
15+
name='approved_at',
16+
),
17+
migrations.RemoveField(
18+
model_name='approvedgrant',
19+
name='approved_at',
20+
),
21+
migrations.RemoveField(
22+
model_name='approvedindividualmember',
23+
name='approved_at',
24+
),
25+
migrations.RemoveField(
26+
model_name='boardmember',
27+
name='account',
28+
),
29+
migrations.RemoveField(
30+
model_name='boardmember',
31+
name='office',
32+
),
33+
migrations.RemoveField(
34+
model_name='boardmember',
35+
name='term',
36+
),
37+
migrations.RemoveField(
38+
model_name='meeting',
39+
name='board_attendees',
40+
),
41+
migrations.RemoveField(
42+
model_name='meeting',
43+
name='leader',
44+
),
45+
migrations.RemoveField(
46+
model_name='business',
47+
name='meeting',
48+
),
49+
migrations.RemoveField(
50+
model_name='meeting',
51+
name='non_board_attendees',
52+
),
53+
migrations.DeleteModel(
54+
name='ActionItem',
55+
),
56+
migrations.DeleteModel(
57+
name='ApprovedCorporateMember',
58+
),
59+
migrations.DeleteModel(
60+
name='ApprovedGrant',
61+
),
62+
migrations.DeleteModel(
63+
name='ApprovedIndividualMember',
64+
),
65+
migrations.DeleteModel(
66+
name='Office',
67+
),
68+
migrations.DeleteModel(
69+
name='Term',
70+
),
71+
migrations.DeleteModel(
72+
name='BoardMember',
73+
),
74+
migrations.DeleteModel(
75+
name='Business',
76+
),
77+
migrations.DeleteModel(
78+
name='Meeting',
79+
),
80+
migrations.DeleteModel(
81+
name='NonBoardAttendee',
82+
),
83+
]

foundation/models.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
from decimal import Decimal
2-
3-
from django.conf import settings
41
from django.db import models
5-
from django.urls import reverse
6-
from django.utils.dateformat import format as date_format
72
from django.utils.translation import gettext_lazy as _
8-
from djmoney.models.fields import MoneyField
9-
from djmoney.settings import CURRENCIES
10-
from docutils.core import publish_parts
11-
12-
from blog.models import BLOG_DOCUTILS_SETTINGS
13-
143

154
class CoreAwardCohort(models.Model):
165
"""

foundation/tests.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
from django.contrib.auth.models import User
2+
from django.contrib.flatpages.models import FlatPage
3+
from django.contrib.sites.models import Site
24
from django.test import TestCase
35

46
class MeetingTestCase(TestCase):
@@ -7,21 +9,17 @@ def setUpTestData(cls):
79
cls.user = User.objects.create_superuser(
810
"admin", "[email protected]", "password"
911
)
12+
cls.site = Site.objects.get_current()
1013

1114
def test_latest_meeting_minutes(self):
12-
pass
13-
14-
# TODO: Find a way to initalize the foundation page without using the Meeting
15-
# object
15+
page = FlatPage.objects.create(
16+
title="Foundation",
17+
url="/foundation/",
18+
template_name="flatpages/foundation.html"
19+
)
20+
page.sites.add(self.site)
1621

17-
common_meeting_data = {
18-
"slug": "dsf-board-monthly-meeting",
19-
"leader": self.member,
20-
"treasurer_report": "Hello World",
21-
"title": "DSF Board monthly meeting",
22-
}
23-
Meeting.objects.create(date=date(2023, 3, 12), **common_meeting_data)
24-
response = self.client.get(reverse("foundation_meeting_archive_index"))
22+
response = self.client.get("/foundation/")
2523

2624
self.assertContains(response, "Latest DSF meeting minutes")
2725
self.assertContains(response, "https://github.com/django/dsf-minutes")

foundation/urls/__init__.py

Whitespace-only changes.

foundation/urls/meetings.py

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)