inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)

Browse Source 
105171: SHA-935: Repository Invite Flow Changes
     - Updated remote-api tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ray Gauss
2015-08-25 14:00:46 +00:00
parent c8c2441ba3
commit 16f3bba3ba
3 changed files with 87 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/test-java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
View File

@@ -867,12 +867,6 @@ public class SiteServiceTest extends BaseWebScriptTest
String acceptURL = "page/accept-invite";
String rejectURL = "page/reject-invite";
// Create a nominated invitation
String nominatedId = createNominatedInvitation(shortName, inviteeFirstName, inviteeLastName, inviteeEmail, inviteeUserName, roleName, serverPath, acceptURL, rejectURL, 201);
// Get the nominated invitation
sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/" + nominatedId), 200);
//Create a new moderated invitation
String moderatedId = createModeratedInvitation(shortName, inviteComments, userName, roleName);
@@ -881,13 +875,13 @@ public class SiteServiceTest extends BaseWebScriptTest
// search for the moderated invitation
sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations?inviteeUserName=" + userName), 200);
// Create a nominated invitation
String nominatedId = createNominatedInvitation(shortName, inviteeFirstName, inviteeLastName, inviteeEmail, inviteeUserName, roleName, serverPath, acceptURL, rejectURL, 201);
// Search for all invitations on this site
sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations"), 200);
// cancel the nominated invitation
sendRequest(new DeleteRequest(URL_SITES + "/" + shortName + "/invitations/" + nominatedId), 200);
// cancel the moderated invitation
sendRequest(new DeleteRequest(URL_SITES + "/" + shortName + "/invitations/" + moderatedId), 200);
}
@@ -1076,18 +1070,16 @@ public class SiteServiceTest extends BaseWebScriptTest
}
/**
* search by user - find USER_TWO's two invitations
* search by user - find USER_TWO's invitation
*/
{
Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations?inviteeUserName=" + USER_TWO), 200);
JSONObject top = new JSONObject(response.getContentAsString());
//System.out.println(response.getContentAsString());
JSONArray data = top.getJSONArray("data");
assertEquals("user two invitation not found", data.length(), 2);
assertEquals("user two invitation not found", 1, data.length());
JSONObject first = data.getJSONObject(0);
assertEquals("first userid is wrong", first.getString("inviteeUserName"), USER_TWO);
JSONObject second = data.getJSONObject(0);
assertEquals("second userid is wrong", second.getString("inviteeUserName"), USER_TWO);
assertEquals("userid is wrong", first.getString("inviteeUserName"), USER_TWO);
}
@@ -1103,14 +1095,6 @@ public class SiteServiceTest extends BaseWebScriptTest
assertEquals("two moderated invitations not found", data.length(), 2);
}
{
Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations?invitationType=NOMINATED"), 200);
JSONObject top = new JSONObject(response.getContentAsString());
//System.out.println(response.getContentAsString());
JSONArray data = top.getJSONArray("data");
assertEquals("one nominated invitation not found", data.length(), 1);
}
// negative test - unknown invitationType
{
Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations?invitationType=Crap"), 500);