Make Accepted Proposals Live (#34)

* make accepted proposals live

* update tests
This commit is contained in:
Danny Skubak 2019-10-17 18:25:12 -04:00 committed by Daniel Ternyak
parent fb6b9b5af7
commit 58eb8f2455
2 changed files with 4 additions and 4 deletions

View File

@ -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'

View File

@ -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")