Upgrade django-money to 3.1. (#1439)

* Added test for meeting details.

* Upgraded django-money to 3.1.

djangoproject/templates/foundation/meeting_detail.html

@@ -4,7 +4,7 @@
 {% block og_description %}Meeting minutes for {{ meeting }}{% endblock %}
 
 {% block content %}
-  {% load foundation %}
+  {% load djmoney %}
 
   <h1>{{ meeting }}</h1>
 
@@ -32,7 +32,7 @@ <h2>Finances</h2>
 
   <h3>Balance</h3>
 
-  <p>{{ meeting.treasurer_balance|currency }}</p>
+  <p>{{ meeting.treasurer_balance.currency.code }} {% money_localize meeting.treasurer_balance %}</p>
 
   {% if meeting.treasurer_report %}
     <h3>Treasurer&#8217;s report</h3>
@@ -44,7 +44,7 @@ <h2>Grants approved </h2>
 
     <ul>
       {% for grant in meeting.grants_approved.all %}
-        <li>{{ grant.entity }}: {{ grant.amount|currency }}</li>
+        <li>{{ grant.entity }}: {{ grant.amount.currency.code }} {% money_localize grant.amount %}</li>
       {% endfor %}
     </ul>
   {% endif %}

foundation/tests.py

@@ -3,8 +3,9 @@
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.urls import reverse
+from djmoney.money import Money
 
-from .models import BoardMember, Meeting, Office, Term
+from .models import ApprovedGrant, BoardMember, Meeting, Office, Term
 
 
 class MeetingTestCase(TestCase):
@@ -36,3 +37,43 @@ def test_meeting_minutes_feed(self):
         response = self.client.get(reverse("foundation-minutes-feed"))
         self.assertEqual(response.status_code, 200)
         self.assertIn(b"DSF Board monthly meeting", response.content)
+
+    def test_meeting_details(self):
+        user = User.objects.create_superuser("admin", "[email protected]", "password")
+        self.client.force_login(user)
+        member = BoardMember.objects.create(
+            account=user,
+            office=Office.objects.create(name="treasurer"),
+            term=Term.objects.create(year=2023),
+        )
+        meeting = Meeting.objects.create(
+            date=date(2023, 1, 12),
+            title="DSF Board monthly meeting",
+            slug="dsf-board-monthly-meeting",
+            leader=member,
+            treasurer_report="Hello World",
+        )
+        ApprovedGrant.objects.create(
+            entity="Django girls",
+            amount=Money("10000", "USD"),
+            approved_at=meeting,
+        )
+        ApprovedGrant.objects.create(
+            entity="DjangoCon EU",
+            amount=Money(5000, "EUR"),
+            approved_at=meeting,
+        )
+        response = self.client.get(
+            reverse(
+                "foundation_meeting_detail",
+                kwargs={
+                    "year": 2023,
+                    "month": "jan",
+                    "day": 12,
+                    "slug": "dsf-board-monthly-meeting",
+                },
+            )
+        )
+        self.assertContains(response, "DSF Board monthly meeting")
+        self.assertContains(response, "USD $10,000.00")
+        self.assertContains(response, "EUR €5,000.00")

requirements/common.txt

@@ -2,7 +2,7 @@ Babel==2.10.1
 django-contact-form==2.1
 django-countries==7.5.1
 django-hosts==5.1
-django-money==2.1.1
+django-money==3.1
 django-push==1.1
 django-read-only==1.12.0
 django-recaptcha==3.0.0