Skip to content

Commit b907300

Browse files
Xaohssvenvandescheur
authored andcommitted
🚧 - wip: fixing tests
1 parent da8cff7 commit b907300

File tree

7 files changed

+28
-20
lines changed

7 files changed

+28
-20
lines changed

backend/src/openarchiefbeheer/destruction/tests/endpoints/test_reviewresponse.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,14 @@ def test_audit_log(self):
238238
self.assertEqual(
239239
data[0]["message"],
240240
_(
241-
'User "%(user)s" with the role of "%(role)s" has reassigned destruction list "%(list_name)s".'
241+
'User "%(user)s" (member of group%(n_groups)s "%(groups)s") has reassigned destruction list "%(list_name)s".'
242242
)
243-
% {"list_name": "Test audittrail", "user": record_manager, "role": ""},
243+
% {
244+
"list_name": "Test audittrail",
245+
"user": record_manager,
246+
"n_groups": "",
247+
"groups": "",
248+
},
244249
)
245250
self.assertEqual(
246251
data[0]["extra_data"]["assignee"]["user"],

backend/src/openarchiefbeheer/destruction/tests/test_endpoints.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -565,14 +565,15 @@ def test_mark_as_final(self):
565565
message = logs[0].get_message()
566566

567567
self.assertEqual(
568-
message.strip("\n"),
568+
message,
569569
_(
570-
'User "%(user)s" with the role of "%(role)s" has made destruction list "%(list_name)s" final and '
571-
"assigned it to the archivist %(archivist)s."
570+
'User "%(user)s" (member of group%(n_groups)s "%(groups)s") has made destruction list "%(list_name)s" final and '
571+
'assigned it to the archivist "%(archivist)s".'
572572
)
573573
% {
574574
"user": record_manager,
575-
"role": "",
575+
"groups": "",
576+
"n_groups": "",
576577
"list_name": "A test list",
577578
"record_manager": "record_manager",
578579
"archivist": "archivist",

backend/src/openarchiefbeheer/destruction/tests/test_serializers.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,16 @@ def test_create_destruction_list(self):
108108
self.assertEqual(logs.count(), 1)
109109

110110
message = logs[0].get_message()
111-
112111
self.assertEqual(
113112
message,
114113
_(
115-
'User "%(author)s" with the role of "%(role)s" has created destruction list "%(list_name)s".'
114+
'User "%(author)s" (member of group%(n_groups)s "%(groups)s") has created destruction list "%(list_name)s".'
116115
)
117116
% {
118117
"list_name": "A test list",
119118
"author": "Jeffrey Jones (record_manager)",
120-
"role": "",
119+
"groups": "",
120+
"n_groups": "",
121121
},
122122
)
123123

@@ -1049,10 +1049,9 @@ def test_create_review_rejected(self):
10491049

10501050
self.assertEqual(logs.count(), 1)
10511051
self.assertEqual(logs[0].user, reviewer)
1052-
self.assertFalse(logs[0].extra_data["approved"])
10531052
self.assertEqual(
10541053
logs[0].get_message(),
1055-
'User "Jeffrey Jones (reviewer)" with the role of "" has reviewed the list "Test list". The destruction list was rejected.',
1054+
'User "Jeffrey Jones (reviewer)" (member of group "") has reviewed the list "Test list". The destruction list was rejected.',
10561055
)
10571056

10581057
def test_reviewing_cases_not_in_destruction_list(self):

backend/src/openarchiefbeheer/logging/logevent.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
def _create_log(
1818
model: Model, event: str, extra_data: dict | None = None, user: User | None = None
1919
) -> TimelineLog:
20+
if extra_data is None:
21+
# Making sure extra_data is always a dict to prevent NoneType errors
22+
extra_data = {}
23+
2024
if user:
2125
serializer = UserSerializer(user)
2226
user_groups = [group.name for group in user.groups.all()]
@@ -25,7 +29,7 @@ def _create_log(
2529
return TimelineLog.objects.create(
2630
content_object=model,
2731
template=f"logging/{event}.txt",
28-
extra_data=extra_data or {},
32+
extra_data=extra_data,
2933
user=user,
3034
)
3135

backend/src/openarchiefbeheer/logging/templates/logging/destruction_list_created.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
33
{% blocktranslate trimmed with list_name=log.content_object.name groups=groups n_groups=n_groups author=log.user %}
44
User "{{ author }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has created destruction list "{{ list_name }}".
5-
{% endblocktranslate %}
6-
{% endwith %}
5+
{% endblocktranslate %}{% endwith %}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% load i18n %}
22
{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
3-
{% blocktranslate trimmed with timestamp=log.timestamp|date:"c" list_name=log.content_object.name groups=groups n_groups=n_groups user=log.user %}
4-
User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has reassigned destruction list "{{ list_name }}" on "{{ timestamp }}".
3+
{% blocktranslate trimmed with list_name=log.content_object.name groups=groups n_groups=n_groups user=log.user %}
4+
User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has reassigned destruction list "{{ list_name }}".
55
{% endblocktranslate %}
6-
{% endwith %}
6+
{% endwith %}
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% load i18n %}
22
{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
3-
{% blocktranslate trimmed with timestamp=log.timestamp|date:"c" list_name=log.content_object.name groups=groups n_groups=n_groups user=log.user approved=log.extra_data.approved %}
4-
User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has reviewed the list "{{ list_name }}" on "{{ timestamp }}".
3+
{% blocktranslate trimmed with list_name=log.content_object.name groups=groups n_groups=n_groups user=log.user approved=log.extra_data.approved %}
4+
User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has reviewed the list "{{ list_name }}".
55
{% endblocktranslate %}
66
{% if approved %}
77
{% translate "The destruction list was approved." %}
88
{% else %}
99
{% translate "The destruction list was rejected." %}
1010
{% endif %}
11-
{% endwith %}
11+
{% endwith %}

0 commit comments

Comments
 (0)