From 58eb8f245546c32e5d8861dce9dce65220a7e202 Mon Sep 17 00:00:00 2001 From: Danny Skubak Date: Thu, 17 Oct 2019 18:25:12 -0400 Subject: [PATCH] Make Accepted Proposals Live (#34) * make accepted proposals live * update tests --- backend/grant/proposal/models.py | 4 ++-- backend/tests/admin/test_admin_api.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/grant/proposal/models.py b/backend/grant/proposal/models.py index ab8eaf6e..a95c1d15 100644 --- a/backend/grant/proposal/models.py +++ b/backend/grant/proposal/models.py @@ -494,7 +494,7 @@ class Proposal(db.Model): db.session.add(self) db.session.flush() - # state: status PENDING -> (APPROVED || REJECTED) + # state: status PENDING -> (LIVE || REJECTED) def approve_pending(self, is_approve, with_funding, reject_reason=None): self.validate_publishable() # specific validation @@ -502,7 +502,7 @@ class Proposal(db.Model): raise ValidationException(f"Proposal must be pending to approve or reject") if is_approve: - self.status = ProposalStatus.APPROVED + self.status = ProposalStatus.LIVE self.date_approved = datetime.datetime.now() self.accepted_with_funding = with_funding with_or_out = 'without' diff --git a/backend/tests/admin/test_admin_api.py b/backend/tests/admin/test_admin_api.py index 718e7b28..c896b312 100644 --- a/backend/tests/admin/test_admin_api.py +++ b/backend/tests/admin/test_admin_api.py @@ -256,7 +256,7 @@ class TestAdminAPI(BaseProposalCreatorConfig): ) print(resp.json) self.assert200(resp) - self.assertEqual(resp.json["status"], ProposalStatus.APPROVED) + self.assertEqual(resp.json["status"], ProposalStatus.LIVE) self.assertEqual(resp.json["acceptedWithFunding"], True) self.assertEqual(resp.json["target"], resp.json["contributionBounty"]) @@ -274,7 +274,7 @@ class TestAdminAPI(BaseProposalCreatorConfig): ) print(resp.json) self.assert200(resp) - self.assertEqual(resp.json["status"], ProposalStatus.APPROVED) + self.assertEqual(resp.json["status"], ProposalStatus.LIVE) self.assertEqual(resp.json["acceptedWithFunding"], False) self.assertEqual(resp.json["contributionBounty"], "0")