From 90485b8a43f9bdba4c3de404eee7d0ce8d87c298 Mon Sep 17 00:00:00 2001
From: Shrikrishna Singh <krishnasingh.ss30@gmail.com>
Date: Tue, 12 Apr 2022 11:23:14 +0530
Subject: [PATCH] Fix tests
---
hypha/apply/projects/models/payment.py | 2 +-
hypha/apply/projects/tests/test_forms.py | 26 -----------------------
hypha/apply/projects/tests/test_models.py | 5 +++--
3 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/hypha/apply/projects/models/payment.py b/hypha/apply/projects/models/payment.py
index e1b76047d..ffbf79f44 100644
--- a/hypha/apply/projects/models/payment.py
+++ b/hypha/apply/projects/models/payment.py
@@ -254,7 +254,7 @@ class Invoice(models.Model):
@property
def value(self):
- return self.paid_value or self.amount
+ return self.paid_value
def get_absolute_url(self):
return reverse(
diff --git a/hypha/apply/projects/tests/test_forms.py b/hypha/apply/projects/tests/test_forms.py
index 57c9c14ad..769a3d661 100644
--- a/hypha/apply/projects/tests/test_forms.py
+++ b/hypha/apply/projects/tests/test_forms.py
@@ -329,32 +329,6 @@ class TestCreateInvoiceForm(TestCase):
self.assertEqual(invoice.supporting_documents.count(), 0)
- def test_invoice_dates_are_correct(self):
- invoice = SimpleUploadedFile('invoice.pdf', BytesIO(b'somebinarydata').read())
- files = {
- 'document': invoice,
- }
-
- form = CreateInvoiceForm(
- files=files,
- data={
- 'paid_value': '10',
- 'comment': 'test comment',
-
- }
- )
- self.assertTrue(form.is_valid(), msg=form.errors)
-
- form = CreateInvoiceForm(
- files=files,
- data={
- 'paid_value': '10',
- 'comment': 'test comment',
-
- }
- )
- self.assertFalse(form.is_valid())
-
class TestEditInvoiceForm(TestCase):
diff --git a/hypha/apply/projects/tests/test_models.py b/hypha/apply/projects/tests/test_models.py
index 4ee923a46..92c442a37 100644
--- a/hypha/apply/projects/tests/test_models.py
+++ b/hypha/apply/projects/tests/test_models.py
@@ -19,6 +19,7 @@ from ..models.payment import (
CHANGES_REQUESTED_BY_FINANCE_1,
CHANGES_REQUESTED_BY_FINANCE_2,
CHANGES_REQUESTED_BY_STAFF,
+ CONVERTED,
DECLINED,
INVOICE_STATUS_FINANCE_1_CHOICES,
INVOICE_STATUS_FINANCE_2_CHOICES,
@@ -236,7 +237,7 @@ class TestInvoiceModel(TestCase):
self.assertFalse(invoice.can_user_change_status(user))
def test_finance2_can_change_status(self):
- statuses = [APPROVED_BY_FINANCE_1]
+ statuses = [APPROVED_BY_FINANCE_1, APPROVED_BY_FINANCE_2, CONVERTED]
user = Finance2Factory()
for status in statuses:
invoice = InvoiceFactory(status=status)
@@ -244,7 +245,7 @@ class TestInvoiceModel(TestCase):
def test_finance2_cant_change_status(self):
statuses = [
- APPROVED_BY_STAFF, APPROVED_BY_FINANCE_2, CHANGES_REQUESTED_BY_FINANCE_1, CHANGES_REQUESTED_BY_FINANCE_2,
+ APPROVED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_1, CHANGES_REQUESTED_BY_FINANCE_2,
CHANGES_REQUESTED_BY_STAFF, DECLINED, PAID, RESUBMITTED, SUBMITTED
]
user = Finance2Factory()
--
GitLab