Allow owners to add themselves

gratipay/models/team/mixins/takes.py

@@ -82,10 +82,15 @@ def vet(p):
         vet(participant)
         vet(recorder)
 
-        if recorder.username == self.owner:
-            if take not in (ZERO, PENNY):
+        owner_recording = recorder.username == self.owner
+        owner_taking = participant.username == self.owner
+        taker_recording = recorder == participant
+        adding_or_removing = take in (ZERO, PENNY)
+
+        if owner_recording:
+            if not adding_or_removing and not owner_taking:
                 raise NotAllowed("owner can only add and remove members, not otherwise set takes")
-        elif recorder != participant:
+        elif not taker_recording:
             raise NotAllowed("can only set own take")
 
         with self.db.get_cursor(cursor) as cursor:

tests/py/test_billing_payday.py

@@ -10,7 +10,6 @@
 from gratipay.billing.payday import NoPayday, Payday
 from gratipay.exceptions import NegativeBalance
 from gratipay.models.participant import Participant
-from gratipay.models.team.mixins.takes import NotAllowed
 from gratipay.testing import Foobar, D,P
 from gratipay.testing.billing import BillingHarness
 from gratipay.testing.emails import EmailHarness
@@ -609,17 +608,15 @@ def test_pt_clips_to_balance_when_less_than_available(self):
         assert P('zorro').balance   == D('  0.00')
         assert P('picard').balance  == D('  0.00')
 
-    def test_pt_is_NOT_happy_to_deal_the_owner_in(self):
+    def test_pt_is_happy_to_deal_the_owner_in(self):
         self.make_member('crusher', 150)
         self.make_member('bruiser', 250)
         self.enterprise.set_take_for(self.picard, D('0.01'), self.picard)
-        with pytest.raises(NotAllowed):
-            self.enterprise.set_take_for(self.picard, 50, self.picard)
-        return  # XXX allow owners to join teams!
+        self.enterprise.set_take_for(self.picard, 200, self.picard)
         self.run_through_takes()
         assert P('crusher').balance == D('150.00')
-        assert P('bruiser').balance == D('250.00')
-        assert P('picard').balance  == D(' 50.00')
+        assert P('bruiser').balance == D('150.00')  # Sorry, bruiser.
+        assert P('picard').balance  == D('200.00')
 
 
 class TestNotifyParticipants(EmailHarness):