Fix testEditOrganizationTeamAndMembers (Use _identity to fix has_in_, add_to_, remove_from_)

This commit is contained in:
Vincent Jacques
2012-05-04 15:45:08 +02:00
parent 5ae4dd1233
commit 7c749bf445
11 changed files with 144 additions and 87 deletions
+6 -6
View File
@@ -155,7 +155,7 @@ class AuthenticatedUser( object ):
def add_to_following( self, following ):
status, headers, data = self.__requester.request(
"PUT",
str( self.url ) + "/following/" + str( following.login ),
str( self.url ) + "/following/" + str( following._identity ),
None,
None
)
@@ -163,7 +163,7 @@ class AuthenticatedUser( object ):
def add_to_watched( self, watched ):
status, headers, data = self.__requester.request(
"PUT",
str( self.url ) + "/watched/" + str( watched.login ),
str( self.url ) + "/watched/" + str( watched._identity ),
None,
None
)
@@ -437,7 +437,7 @@ class AuthenticatedUser( object ):
def has_in_following( self, following ):
status, headers, data = self.__requester.request(
"GET",
str( self.url ) + "/following/" + str( following.login ),
str( self.url ) + "/following/" + str( following._identity ),
None,
None
)
@@ -446,7 +446,7 @@ class AuthenticatedUser( object ):
def has_in_watched( self, watched ):
status, headers, data = self.__requester.request(
"GET",
str( self.url ) + "/watched/" + str( watched.login ),
str( self.url ) + "/watched/" + str( watched._identity ),
None,
None
)
@@ -458,7 +458,7 @@ class AuthenticatedUser( object ):
def remove_from_following( self, following ):
status, headers, data = self.__requester.request(
"DELETE",
str( self.url ) + "/following/" + str( following.login ),
str( self.url ) + "/following/" + str( following._identity ),
None,
None
)
@@ -466,7 +466,7 @@ class AuthenticatedUser( object ):
def remove_from_watched( self, watched ):
status, headers, data = self.__requester.request(
"DELETE",
str( self.url ) + "/watched/" + str( watched.login ),
str( self.url ) + "/watched/" + str( watched._identity ),
None,
None
)
+1 -1
View File
@@ -195,7 +195,7 @@ class Issue( object ):
def remove_from_labels( self, label ):
status, headers, data = self.__requester.request(
"DELETE",
str( self.url ) + "/labels/" + str( label.login ),
str( self.url ) + "/labels/" + str( label._identity ),
None,
None
)
+5
View File
@@ -268,6 +268,11 @@ class NamedUser( object ):
for element in data
]
# @todo Remove '_identity' from the normalized json description
@property
def _identity( self ):
return str( self.login )
def __initAttributes( self ):
self.__avatar_url = None
self.__bio = None
+5 -5
View File
@@ -143,7 +143,7 @@ class Organization( object ):
def add_to_public_members( self, public_member ):
status, headers, data = self.__requester.request(
"PUT",
str( self.url ) + "/public_members/" + str( public_member.login ),
str( self.url ) + "/public_members/" + str( public_member._identity ),
None,
None
)
@@ -294,7 +294,7 @@ class Organization( object ):
def has_in_members( self, member ):
status, headers, data = self.__requester.request(
"GET",
str( self.url ) + "/members/" + str( member.login ),
str( self.url ) + "/members/" + str( member._identity ),
None,
None
)
@@ -303,7 +303,7 @@ class Organization( object ):
def has_in_public_members( self, public_member ):
status, headers, data = self.__requester.request(
"GET",
str( self.url ) + "/public_members/" + str( public_member.login ),
str( self.url ) + "/public_members/" + str( public_member._identity ),
None,
None
)
@@ -312,7 +312,7 @@ class Organization( object ):
def remove_from_members( self, member ):
status, headers, data = self.__requester.request(
"DELETE",
str( self.url ) + "/members/" + str( member.login ),
str( self.url ) + "/members/" + str( member._identity ),
None,
None
)
@@ -320,7 +320,7 @@ class Organization( object ):
def remove_from_public_members( self, public_member ):
status, headers, data = self.__requester.request(
"DELETE",
str( self.url ) + "/public_members/" + str( public_member.login ),
str( self.url ) + "/public_members/" + str( public_member._identity ),
None,
None
)
+8 -3
View File
@@ -190,7 +190,7 @@ class Repository( object ):
def add_to_collaborators( self, collaborator ):
status, headers, data = self.__requester.request(
"PUT",
str( self.url ) + "/collaborators/" + str( collaborator.login ),
str( self.url ) + "/collaborators/" + str( collaborator._identity ),
None,
None
)
@@ -767,7 +767,7 @@ class Repository( object ):
def has_in_collaborators( self, collaborator ):
status, headers, data = self.__requester.request(
"GET",
str( self.url ) + "/collaborators/" + str( collaborator.login ),
str( self.url ) + "/collaborators/" + str( collaborator._identity ),
None,
None
)
@@ -776,11 +776,16 @@ class Repository( object ):
def remove_from_collaborators( self, collaborator ):
status, headers, data = self.__requester.request(
"DELETE",
str( self.url ) + "/collaborators/" + str( collaborator.login ),
str( self.url ) + "/collaborators/" + str( collaborator._identity ),
None,
None
)
# @todo Remove '_identity' from the normalized json description
@property
def _identity( self ):
return str( self.owner.login ) + "/" + str( self.name )
def __initAttributes( self ):
self.__clone_url = None
self.__created_at = None
+6 -6
View File
@@ -51,7 +51,7 @@ class Team( object ):
def add_to_members( self, member ):
status, headers, data = self.__requester.request(
"PUT",
str( self.url ) + "/members/" + str( member.login ),
str( self.url ) + "/members/" + str( member._identity ),
None,
None
)
@@ -59,7 +59,7 @@ class Team( object ):
def add_to_repos( self, repo ):
status, headers, data = self.__requester.request(
"PUT",
str( self.url ) + "/repos/" + str( repo.login ),
str( self.url ) + "/repos/" + str( repo._identity ),
None,
None
)
@@ -113,7 +113,7 @@ class Team( object ):
def has_in_members( self, member ):
status, headers, data = self.__requester.request(
"GET",
str( self.url ) + "/members/" + str( member.login ),
str( self.url ) + "/members/" + str( member._identity ),
None,
None
)
@@ -122,7 +122,7 @@ class Team( object ):
def has_in_repos( self, repo ):
status, headers, data = self.__requester.request(
"GET",
str( self.url ) + "/repos/" + str( repo.login ),
str( self.url ) + "/repos/" + str( repo._identity ),
None,
None
)
@@ -131,7 +131,7 @@ class Team( object ):
def remove_from_members( self, member ):
status, headers, data = self.__requester.request(
"DELETE",
str( self.url ) + "/members/" + str( member.login ),
str( self.url ) + "/members/" + str( member._identity ),
None,
None
)
@@ -139,7 +139,7 @@ class Team( object ):
def remove_from_repos( self, repo ):
status, headers, data = self.__requester.request(
"DELETE",
str( self.url ) + "/repos/" + str( repo.login ),
str( self.url ) + "/repos/" + str( repo._identity ),
None,
None
)