set is_closed=False in opt_in() instead of in set_as_claimed()

gittip/models/account_elsewhere.py

@@ -154,6 +154,8 @@ def opt_in(self, desired_username):
                 user.participant.change_username(desired_username)
             except ProblemChangingUsername:
                 pass
+        if user.participant.is_closed:
+            user.participant.update_is_closed(False)
         return user, newly_claimed
 
     def save_token(self, token, refresh_token=None, expires=None):

gittip/models/participant.py

@@ -241,13 +241,12 @@ def set_as_claimed(self):
 
                 UPDATE participants
                    SET claimed_time=CURRENT_TIMESTAMP
-                     , is_closed=false
                  WHERE username=%s
                    AND claimed_time IS NULL
              RETURNING claimed_time
 
             """, (self.username,))
-            self.set_attributes(claimed_time=claimed_time, is_closed=False)
+            self.set_attributes(claimed_time=claimed_time)
 
 
     # Canceling

tests/py/test_elsewhere.py

@@ -2,6 +2,7 @@
 
 from gittip.elsewhere import UserInfo
 from gittip.models.account_elsewhere import AccountElsewhere
+from gittip.models.participant import Participant
 from gittip.testing import Harness
 import gittip.testing.elsewhere as user_info_examples
 
@@ -33,6 +34,13 @@ def test_opt_in_doesnt_have_to_change_username(self):
         actual = account.opt_in('bob')[0].participant.username
         assert actual == expected
 
+    def test_opt_in_resets_is_closed_to_false(self):
+        alice = self.make_elsewhere('twitter', 1, 'alice')
+        alice.participant.update_is_closed(True)
+        user = alice.opt_in('alice')[0]
+        assert not user.participant.is_closed
+        assert not Participant.from_username('alice').is_closed
+
     def test_redirect_csrf(self):
         response = self.client.GxT('/on/github/redirect')
         assert response.code == 405

tests/py/test_participant.py

@@ -329,12 +329,6 @@ def test_claiming_participant(self):
         expected = datetime.timedelta(seconds=0.1)
         assert actual < expected
 
-    def test_claiming_participant_resets_is_closed_to_false(self):
-        self.participant.update_is_closed(True)
-        self.participant.set_as_claimed()
-        assert not self.participant.is_closed
-        assert not Participant.from_username('user1').is_closed
-
     def test_changing_username_successfully(self):
         self.participant.change_username('user2')
         actual = Participant.from_username('user2')