From 1f32dc8d6997d2be502b405048ff45ccf7b039c9 Mon Sep 17 00:00:00 2001 From: Andrei Rusu Date: Mon, 28 Nov 2016 17:36:44 +0200 Subject: [PATCH 1/3] Added tests for GetSiteMembershipRequestsCore --- .../GetSiteMembershipRequestsCoreTests.java | 179 ++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java diff --git a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java new file mode 100644 index 000000000..d2ff8e6f1 --- /dev/null +++ b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java @@ -0,0 +1,179 @@ +package org.alfresco.rest.people; + +import org.alfresco.rest.RestTest; +import org.alfresco.rest.core.RestRequest; +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.model.RestSiteMembershipRequestModelsCollection; +import org.alfresco.utility.constants.UserRole; +import org.alfresco.utility.data.RandomData; +import org.alfresco.utility.data.DataUser.ListUserWithRoles; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.TestGroup; +import org.alfresco.utility.model.UserModel; +import org.alfresco.utility.report.Bug; +import org.alfresco.utility.testrail.ExecutionType; +import org.alfresco.utility.testrail.annotation.TestRail; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.social.alfresco.api.entities.Role; +import org.springframework.social.alfresco.api.entities.Site.Visibility; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +/** + * Tests for getSiteMembershipRequests (get + * /people/{personId}/site-membership-requests) Core-RestAPI call + * + * @author Andrei Rusu + */ + +@Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) +public class GetSiteMembershipRequestsCoreTests extends RestTest { + + UserModel userModel, newMember; + SiteModel siteModel, siteModel2; + RestWrapper restWrapper; + + @BeforeClass(alwaysRun = true) + public void dataPreparation() throws Exception { + + String siteId = RandomData.getRandomName("site"); + siteModel = dataSite.usingUser(userModel) + .createSite(new SiteModel(Visibility.MODERATED, siteId, siteId, siteId, siteId)); + newMember = dataUser.createRandomTestUser(); + + restClient.authenticateUser(newMember).withCoreAPI().usingAuthUser().addSiteMembershipRequest(siteModel); + + restClient.assertStatusCodeIs(HttpStatus.CREATED); + } + + @Bug(id = "MNT-16557") + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that for invalid maxItems parameter status code is 400.") + public void checkInvalidMaxItemsStatusCode() throws Exception { + + UserModel adminUser = dataUser.getAdminUser(); + + restClient.authenticateUser(adminUser).withParams("maxItems=AB").withCoreAPI().usingUser(newMember) + .getSiteMembershipRequests().assertThat().entriesListIsNotEmpty(); + restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError() + .containsSummary("Invalid paging parameter"); + } + + @Bug(id = "MNT-16557") + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that for invalid skipCount parameter status code is 400.") + public void checkInvalidSkipCountStatusCode() throws Exception { + + UserModel adminUser = dataUser.getAdminUser(); + + restClient.authenticateUser(adminUser).withParams("skipCount=AB").withCoreAPI().usingUser(newMember) + .getSiteMembershipRequests().assertThat().entriesListIsNotEmpty(); + restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError() + .containsSummary("Invalid paging parameter"); + } + + @Bug(id = "MNT-16557") + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that if personId does not exist status code is 404.") + public void ifPersonIdDoesNotExist() throws Exception { + + UserModel adminUser = dataUser.getAdminUser(); + + restClient.authenticateUser(adminUser).withCoreAPI(); + RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, + "people/{personId}/site-membership-requests?{parameters}", newMember.getUsername(), + restClient.getParameters()); + restClient.processModels(RestSiteMembershipRequestModelsCollection.class, request).assertThat() + .entriesListIsNotEmpty(); + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary("not found"); + } + + @Bug(id = "MNT-16557") + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Specify -me- string in place of for request.") + public void replacePersonIdWithMeRequest() throws Exception { + + UserModel adminUser = dataUser.getAdminUser(); + + restClient.authenticateUser(adminUser).withCoreAPI(); + RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, + "people/{me}/site-membership-requests?{parameters}", newMember.getUsername(), + restClient.getParameters()); + restClient.processModels(RestSiteMembershipRequestModelsCollection.class, request).assertThat() + .entriesListIsNotEmpty(); + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary("not found"); + } + + @Bug(id = "MNT-16557") + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Use empty personId.") + public void useEmptyPersonId() throws Exception { + + UserModel adminUser = dataUser.getAdminUser(); + + restClient.authenticateUser(adminUser).withCoreAPI(); + RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, + "people/{personId}/site-membership-requests?{parameters}", "", restClient.getParameters()); + restClient.processModels(RestSiteMembershipRequestModelsCollection.class, request); + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary("not found"); + } + + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Get site membership requests to a public site.") + public void getRequestsToPublicSite() throws Exception { + + String siteId2 = RandomData.getRandomName("site"); + siteModel2 = dataSite.usingUser(userModel) + .createSite(new SiteModel(Visibility.PUBLIC, siteId2, siteId2, siteId2, siteId2)); + newMember = dataUser.createRandomTestUser(); + restClient.authenticateUser(newMember).withCoreAPI().usingAuthUser().addSiteMembershipRequest(siteModel2); + restClient.assertStatusCodeIs(HttpStatus.CREATED); + + UserModel adminUser = dataUser.getAdminUser(); + + restClient.authenticateUser(adminUser).withCoreAPI().usingUser(newMember).getSiteMembershipRequests() + .assertThat().entriesListIsEmpty(); + restClient.assertStatusCodeIs(HttpStatus.OK); + + } + + @Bug(id = "MNT-16557") + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Get site membership requests to a moderated site.") + public void getRequestsToModeratedSite() throws Exception { + + UserModel adminUser = dataUser.getAdminUser(); + + restClient.authenticateUser(adminUser).withCoreAPI().usingUser(newMember).getSiteMembershipRequests() + .assertThat().entriesListIsNotEmpty(); + restClient.assertStatusCodeIs(HttpStatus.OK); + } + + @Bug(id = "MNT-16557") + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Approve request then get requests.") + public void approveRequestThenGetRequests() throws Exception { + + ListUserWithRoles usersWithRoles; + + UserModel adminUser = dataUser.getAdminUser(); + siteModel = dataSite.usingUser(adminUser).createModeratedRandomSite(); + usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, + UserRole.SiteConsumer, UserRole.SiteContributor); + + UserModel testUser = dataUser.createRandomTestUser("testUser"); + testUser.setUserRole(UserRole.SiteConsumer); + restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); + restClient.withCoreAPI().usingSite(siteModel).addPerson(testUser).assertThat().field("id") + .is(testUser.getUsername()).and().field("role").is(testUser.getUserRole()); + restClient.assertStatusCodeIs(HttpStatus.CREATED); + + restClient.authenticateUser(testUser).withCoreAPI().usingAuthUser().addSiteMembershipRequest(siteModel); + + restClient.authenticateUser(adminUser).withCoreAPI().usingUser(testUser).getSiteMembershipRequests() + .assertThat().entriesListIsNotEmpty(); + restClient.assertStatusCodeIs(HttpStatus.OK); + } + +} From dc51515ec3e86fe5dbaaf66c5bd6daed4da9f739 Mon Sep 17 00:00:00 2001 From: Andrei Rusu Date: Tue, 6 Dec 2016 11:17:14 +0200 Subject: [PATCH 2/3] Added changes to getSiteMembershipRequestsCoreTests --- .../GetSiteMembershipRequestsCoreTests.java | 241 +++++++----------- 1 file changed, 99 insertions(+), 142 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java index d2ff8e6f1..1ae77d1a1 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java @@ -1,22 +1,14 @@ package org.alfresco.rest.people; import org.alfresco.rest.RestTest; -import org.alfresco.rest.core.RestRequest; -import org.alfresco.rest.core.RestWrapper; import org.alfresco.rest.model.RestSiteMembershipRequestModelsCollection; -import org.alfresco.utility.constants.UserRole; -import org.alfresco.utility.data.RandomData; -import org.alfresco.utility.data.DataUser.ListUserWithRoles; +import org.alfresco.utility.model.ErrorModel; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; -import org.alfresco.utility.report.Bug; import org.alfresco.utility.testrail.ExecutionType; import org.alfresco.utility.testrail.annotation.TestRail; -import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; -import org.springframework.social.alfresco.api.entities.Role; -import org.springframework.social.alfresco.api.entities.Site.Visibility; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -27,153 +19,118 @@ import org.testng.annotations.Test; * @author Andrei Rusu */ -@Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) -public class GetSiteMembershipRequestsCoreTests extends RestTest { +public class GetSiteMembershipRequestsCoreTests extends RestTest +{ + UserModel newMember, adminUser; + SiteModel moderatedSite, publicSite; + RestSiteMembershipRequestModelsCollection returnedCollection; - UserModel userModel, newMember; - SiteModel siteModel, siteModel2; - RestWrapper restWrapper; + @BeforeClass(alwaysRun = true) + public void dataPreparation() throws Exception + { + adminUser = dataUser.getAdminUser(); + moderatedSite = dataSite.usingAdmin().createModeratedRandomSite(); + publicSite = dataSite.usingAdmin().createPublicRandomSite(); + newMember = dataUser.createRandomTestUser(); - @BeforeClass(alwaysRun = true) - public void dataPreparation() throws Exception { + restClient.authenticateUser(newMember).withCoreAPI().usingAuthUser().addSiteMembershipRequest(moderatedSite); - String siteId = RandomData.getRandomName("site"); - siteModel = dataSite.usingUser(userModel) - .createSite(new SiteModel(Visibility.MODERATED, siteId, siteId, siteId, siteId)); - newMember = dataUser.createRandomTestUser(); + restClient.assertStatusCodeIs(HttpStatus.CREATED); + } - restClient.authenticateUser(newMember).withCoreAPI().usingAuthUser().addSiteMembershipRequest(siteModel); + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that for invalid maxItems parameter status code returned is 400.") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void checkInvalidMaxItemsStatusCode() throws Exception + { + restClient.authenticateUser(adminUser).withParams("maxItems=AB").withCoreAPI().usingUser(newMember).getSiteMembershipRequests(); + restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary("Invalid paging parameter"); + } - restClient.assertStatusCodeIs(HttpStatus.CREATED); - } + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that for invalid skipCount parameter status code returned is 400.") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void checkInvalidSkipCountStatusCode() throws Exception + { + restClient.authenticateUser(adminUser).withParams("skipCount=AB").withCoreAPI().usingUser(newMember).getSiteMembershipRequests(); + restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary("Invalid paging parameter"); + } - @Bug(id = "MNT-16557") - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that for invalid maxItems parameter status code is 400.") - public void checkInvalidMaxItemsStatusCode() throws Exception { + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that if personId does not exist status code returned is 404.") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void ifPersonIdDoesNotExist() throws Exception + { + UserModel nonexistentUser = dataUser.createRandomTestUser(); + nonexistentUser.setUsername("nonexistent"); + + restClient.authenticateUser(adminUser).withCoreAPI().usingUser(nonexistentUser).getSiteMembershipRequests(); + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, "nonexistent")); + } - UserModel adminUser = dataUser.getAdminUser(); + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Specify -me- string in place of for request.") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void replacePersonIdWithMeRequest() throws Exception + { + returnedCollection = restClient.authenticateUser(newMember).withCoreAPI().usingMe().getSiteMembershipRequests(); + restClient.assertStatusCodeIs(HttpStatus.OK); + returnedCollection.assertThat().entriesListContains("id", moderatedSite.getId()); + } - restClient.authenticateUser(adminUser).withParams("maxItems=AB").withCoreAPI().usingUser(newMember) - .getSiteMembershipRequests().assertThat().entriesListIsNotEmpty(); - restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError() - .containsSummary("Invalid paging parameter"); - } + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that if empty personId is used status code returned is 404.") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void useEmptyPersonId() throws Exception + { + UserModel emptyNameMember = dataUser.createRandomTestUser(); + emptyNameMember.setUsername(" "); + + restClient.authenticateUser(adminUser).withCoreAPI().usingUser(emptyNameMember).getSiteMembershipRequests(); + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary("The entity with id: " + emptyNameMember.getUsername() + " was not found"); + } - @Bug(id = "MNT-16557") - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that for invalid skipCount parameter status code is 400.") - public void checkInvalidSkipCountStatusCode() throws Exception { + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Get site membership requests to a public site.") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void getRequestsToPublicSite() throws Exception + { + restClient.authenticateUser(newMember).withCoreAPI().usingAuthUser().addSiteMembershipRequest(publicSite); + restClient.assertStatusCodeIs(HttpStatus.CREATED); - UserModel adminUser = dataUser.getAdminUser(); + returnedCollection = restClient.withCoreAPI().usingAuthUser().getSiteMembershipRequests(); + restClient.assertStatusCodeIs(HttpStatus.OK); + returnedCollection.assertThat().entriesListDoesNotContain("id", publicSite.getId()); + } - restClient.authenticateUser(adminUser).withParams("skipCount=AB").withCoreAPI().usingUser(newMember) - .getSiteMembershipRequests().assertThat().entriesListIsNotEmpty(); - restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError() - .containsSummary("Invalid paging parameter"); - } + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Get site membership requests to a moderated site.") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void getRequestsToModeratedSite() throws Exception + { + returnedCollection = restClient.authenticateUser(newMember).withCoreAPI().usingUser(newMember).getSiteMembershipRequests(); + restClient.assertStatusCodeIs(HttpStatus.OK); + returnedCollection.assertThat().entriesListContains("id", moderatedSite.getId()); + } - @Bug(id = "MNT-16557") - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that if personId does not exist status code is 404.") - public void ifPersonIdDoesNotExist() throws Exception { + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Approve request then get requests.") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void approveRequestThenGetRequests() throws Exception + { + UserModel siteManager = dataUser.createRandomTestUser(); - UserModel adminUser = dataUser.getAdminUser(); + moderatedSite = dataSite.usingUser(siteManager).createModeratedRandomSite(); + restClient.authenticateUser(newMember).withCoreAPI().usingMe().addSiteMembershipRequest(moderatedSite); + restClient.assertStatusCodeIs(HttpStatus.CREATED); - restClient.authenticateUser(adminUser).withCoreAPI(); - RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, - "people/{personId}/site-membership-requests?{parameters}", newMember.getUsername(), - restClient.getParameters()); - restClient.processModels(RestSiteMembershipRequestModelsCollection.class, request).assertThat() - .entriesListIsNotEmpty(); - restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary("not found"); - } + //TODO approve request + /* newMember.setUserRole(UserRole.SiteConsumer); + restClient.authenticateUser(siteManager).withCoreAPI().usingSite(siteModel).addPerson(newMember).assertThat().field("id").is(newMember.getUsername()) + .and().field("role").is(newMember.getUserRole()); + restClient.assertStatusCodeIs(HttpStatus.CREATED);*/ - @Bug(id = "MNT-16557") - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Specify -me- string in place of for request.") - public void replacePersonIdWithMeRequest() throws Exception { - - UserModel adminUser = dataUser.getAdminUser(); - - restClient.authenticateUser(adminUser).withCoreAPI(); - RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, - "people/{me}/site-membership-requests?{parameters}", newMember.getUsername(), - restClient.getParameters()); - restClient.processModels(RestSiteMembershipRequestModelsCollection.class, request).assertThat() - .entriesListIsNotEmpty(); - restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary("not found"); - } - - @Bug(id = "MNT-16557") - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Use empty personId.") - public void useEmptyPersonId() throws Exception { - - UserModel adminUser = dataUser.getAdminUser(); - - restClient.authenticateUser(adminUser).withCoreAPI(); - RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, - "people/{personId}/site-membership-requests?{parameters}", "", restClient.getParameters()); - restClient.processModels(RestSiteMembershipRequestModelsCollection.class, request); - restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary("not found"); - } - - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Get site membership requests to a public site.") - public void getRequestsToPublicSite() throws Exception { - - String siteId2 = RandomData.getRandomName("site"); - siteModel2 = dataSite.usingUser(userModel) - .createSite(new SiteModel(Visibility.PUBLIC, siteId2, siteId2, siteId2, siteId2)); - newMember = dataUser.createRandomTestUser(); - restClient.authenticateUser(newMember).withCoreAPI().usingAuthUser().addSiteMembershipRequest(siteModel2); - restClient.assertStatusCodeIs(HttpStatus.CREATED); - - UserModel adminUser = dataUser.getAdminUser(); - - restClient.authenticateUser(adminUser).withCoreAPI().usingUser(newMember).getSiteMembershipRequests() - .assertThat().entriesListIsEmpty(); - restClient.assertStatusCodeIs(HttpStatus.OK); - - } - - @Bug(id = "MNT-16557") - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Get site membership requests to a moderated site.") - public void getRequestsToModeratedSite() throws Exception { - - UserModel adminUser = dataUser.getAdminUser(); - - restClient.authenticateUser(adminUser).withCoreAPI().usingUser(newMember).getSiteMembershipRequests() - .assertThat().entriesListIsNotEmpty(); - restClient.assertStatusCodeIs(HttpStatus.OK); - } - - @Bug(id = "MNT-16557") - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Approve request then get requests.") - public void approveRequestThenGetRequests() throws Exception { - - ListUserWithRoles usersWithRoles; - - UserModel adminUser = dataUser.getAdminUser(); - siteModel = dataSite.usingUser(adminUser).createModeratedRandomSite(); - usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, - UserRole.SiteConsumer, UserRole.SiteContributor); - - UserModel testUser = dataUser.createRandomTestUser("testUser"); - testUser.setUserRole(UserRole.SiteConsumer); - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.withCoreAPI().usingSite(siteModel).addPerson(testUser).assertThat().field("id") - .is(testUser.getUsername()).and().field("role").is(testUser.getUserRole()); - restClient.assertStatusCodeIs(HttpStatus.CREATED); - - restClient.authenticateUser(testUser).withCoreAPI().usingAuthUser().addSiteMembershipRequest(siteModel); - - restClient.authenticateUser(adminUser).withCoreAPI().usingUser(testUser).getSiteMembershipRequests() - .assertThat().entriesListIsNotEmpty(); - restClient.assertStatusCodeIs(HttpStatus.OK); - } + returnedCollection = restClient.authenticateUser(newMember).withCoreAPI().usingMe().getSiteMembershipRequests(); + restClient.assertStatusCodeIs(HttpStatus.OK); + returnedCollection.assertThat().entriesListDoesNotContain("id", moderatedSite.getId()); + } } From 233b173c3044bbb11fcd203fa21abe6e045bc95e Mon Sep 17 00:00:00 2001 From: cagache Date: Fri, 9 Dec 2016 16:42:56 +0200 Subject: [PATCH 3/3] test: implemented TODO approve request --- .../rest/people/GetSiteMembershipRequestsCoreTests.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java index 1ae77d1a1..cc02ca901 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsCoreTests.java @@ -2,6 +2,7 @@ package org.alfresco.rest.people; import org.alfresco.rest.RestTest; import org.alfresco.rest.model.RestSiteMembershipRequestModelsCollection; +import org.alfresco.rest.model.RestTaskModel; import org.alfresco.utility.model.ErrorModel; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; @@ -122,11 +123,8 @@ public class GetSiteMembershipRequestsCoreTests extends RestTest restClient.authenticateUser(newMember).withCoreAPI().usingMe().addSiteMembershipRequest(moderatedSite); restClient.assertStatusCodeIs(HttpStatus.CREATED); - //TODO approve request - /* newMember.setUserRole(UserRole.SiteConsumer); - restClient.authenticateUser(siteManager).withCoreAPI().usingSite(siteModel).addPerson(newMember).assertThat().field("id").is(newMember.getUsername()) - .and().field("role").is(newMember.getUserRole()); - restClient.assertStatusCodeIs(HttpStatus.CREATED);*/ + RestTaskModel taskModel = restClient.authenticateUser(newMember).withWorkflowAPI().getTasks().getTaskModelByDescription(moderatedSite); + workflow.approveSiteMembershipRequest(siteManager.getUsername(), siteManager.getPassword(), taskModel.getId(), true, "Approve"); returnedCollection = restClient.authenticateUser(newMember).withCoreAPI().usingMe().getSiteMembershipRequests(); restClient.assertStatusCodeIs(HttpStatus.OK);