Code review changes

test/test_api_usage.py

@@ -131,6 +131,10 @@ class ApiTestCase(unittest.TestCase):
 
   def deleteResponse(self, resource_name, params={}, expected_code=204):
     rv = self.app.delete(self.url_for(resource_name, params))
+
+    if rv.status_code != expected_code:
+      print 'Mismatch data for resource DELETE %s: %s' % (resource_name, rv.data)
+
     self.assertEquals(rv.status_code, expected_code)
     return rv.data
 
@@ -827,27 +831,6 @@ class TestAcceptTeamMemberInvite(ApiTestCase):
 
     self.fail(membername + ' not found in team: ' + json.dumps(data))
 
-  def test_accept_wronguser(self):
-    self.login(ADMIN_ACCESS_USER)
-
-    # Create the invite.
-    membername = NO_ACCESS_USER
-    response = self.putJsonResponse(TeamMember,
-                                    params=dict(orgname=ORGANIZATION, teamname='owners',
-                                                membername=membername))
-    
-    self.assertEquals(True, response['invited'])
-
-    # Try to accept the invite.
-    user = model.get_user(membername)
-    invites = list(model.lookup_team_invites(user))
-    self.assertEquals(1, len(invites))
-
-    self.putResponse(TeamMemberInvite,
-                     params=dict(code=invites[0].invite_token),
-                     expected_code=404)
-
-
   def test_accept(self):
     self.login(ADMIN_ACCESS_USER)
 
@@ -935,6 +918,40 @@ class TestDeclineTeamMemberInvite(ApiTestCase):
 
 
 class TestDeleteOrganizationTeamMember(ApiTestCase):
+  def test_deletememberinvite(self):
+    self.login(ADMIN_ACCESS_USER)
+
+    membername = NO_ACCESS_USER
+    response = self.putJsonResponse(TeamMember,
+                                    params=dict(orgname=ORGANIZATION, teamname='readers',
+                                                membername=membername))
+     
+
+    self.assertEquals(True, response['invited'])
+
+    # Verify the invite was added.
+    json = self.getJsonResponse(TeamMemberList,
+                                params=dict(orgname=ORGANIZATION,
+                                            teamname='readers',
+                                            includePending=True))
+
+    assert len(json['members']) == 3
+
+    # Delete the invite.
+    self.deleteResponse(TeamMember,
+                        params=dict(orgname=ORGANIZATION, teamname='readers',
+                                    membername=membername))
+    
+
+    # Verify the user was removed from the team.
+    json = self.getJsonResponse(TeamMemberList,
+                                params=dict(orgname=ORGANIZATION,
+                                            teamname='readers',
+                                            includePending=True))
+
+    assert len(json['members']) == 2
+
+
   def test_deletemember(self):
     self.login(ADMIN_ACCESS_USER)