diff --git a/auctions/models.py b/auctions/models.py index 45f5e99e..6003f487 100644 --- a/auctions/models.py +++ b/auctions/models.py @@ -217,7 +217,7 @@ def __unicode__(self): ) def payouts(self): - return Payout.objects.filter(claim=self).all() + return Payout.objects.filter(claim=self) def payout_request(self): if self.status == 'Paid': diff --git a/auctions/tests/model_tests.py b/auctions/tests/model_tests.py index 3cfdb651..2edd0c49 100644 --- a/auctions/tests/model_tests.py +++ b/auctions/tests/model_tests.py @@ -441,6 +441,7 @@ def test_bid_fees(self, mock_stripe): self.assertEqual(offer.amount, 50) fees = OfferFee.objects.filter(offer=offer) self.assertEqual(len(fees), 2) + self.assertEqual(len(fees), len(offer.fees())) sum_fees = fees.aggregate(Sum('amount'))['amount__sum'] offer_with_fees = offer.amount + sum_fees self.assertEqual(offer_with_fees, offer.charge_amount) @@ -454,6 +455,7 @@ def test_new_offer(self, mock_stripe): self.bid.save() offers = Offer.objects.filter(bid=self.bid) self.assertEqual(len(offers), 2) + self.assertEqual(len(self.bid.offers()), 2) sum_offers = offers.aggregate(Sum('amount'))['amount__sum'] self.assertEqual(sum_offers, 60) @@ -474,6 +476,14 @@ def test_offer_fee_calculatons(self, mock_request, mock_stripe): class PayoutTest(TestCase): + def test_payouts_property(self): + claim = mommy.make(Claim) + mommy.make(Payout, claim=claim) + mommy.make(Payout, claim=claim) + mommy.make(Payout, claim=claim) + payouts = Payout.objects.all() + self.assertEqual(len(claim.payouts.all()), len(payouts)) + @fudge.patch('auctions.models.requests') @fudge.patch('auctions.models.stripe.Charge.create') def setUp(self, mock_request, mock_stripe): @@ -508,19 +518,26 @@ def test_payout_request(self, mock_request, mock_paypal): mock_request.provides('get').returns("