inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Tags-fixes' into 'master'

Browse Source 
Tags fixes

See merge request !133
This commit is contained in:
Paul Brodner
2016-10-25 15:02:19 +01:00
parent 1f41e666b0 0e9be83d42
commit 0ce9cc4021
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/java/org/alfresco/rest/tags/AddTagSanityTests.java
+6 -13
View File
@@ -7,10 +7,7 @@ import org.alfresco.rest.requests.RestTagsApi;
import org.alfresco.utility.constants.UserRole;
import org.alfresco.utility.data.DataUser;
import org.alfresco.utility.data.RandomData;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.model.*;
import org.alfresco.utility.report.Bug;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
@@ -62,7 +59,7 @@ public class AddTagSanityTests extends RestTest
{
restClient.authenticateUser(adminUserModel);
tagsAPI.addTag(document, tagValue)
.assertThat().field("tag").is("tagValue")
.assertThat().field("tag").is(tagValue)
.and().field("id").isNotEmpty();
tagsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
@@ -95,10 +92,8 @@ public class AddTagSanityTests extends RestTest
public void contributorIsNotAbleToAddTagToAnotherContent() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor));
tagsAPI.addTag(document, tagValue)
.assertThat().field("id").isNotEmpty()
.and().field("tag").is(tagValue);
tagsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN);
tagsAPI.addTag(document, tagValue);
tagsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED);
}
@TestRail(section = { TestGroup.REST_API,
@@ -119,10 +114,8 @@ public class AddTagSanityTests extends RestTest
public void consumerIsNotAbleToAddTag() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer));
tagsAPI.addTag(document, tagValue)
.assertThat().field("id").isNotEmpty()
.and().field("tag").is(tagValue);
tagsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN);
tagsAPI.addTag(document, tagValue);
tagsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED);
}
@TestRail(section = { TestGroup.REST_API,
e2e-test/java/org/alfresco/rest/tags/AddTagsSanityTests.java
+8 -8
View File
@@ -63,8 +63,8 @@ public class AddTagsSanityTests extends RestTest
{
restClient.authenticateUser(adminUserModel);
tagsAPI.addTags(document, tag1, tag2)
.assertThat().entriesListContains("tag", tag1.toLowerCase())
.and().entriesListContains("tag", tag2.toLowerCase());
.assertThat().entriesListContains("tag", tag1)
.and().entriesListContains("tag", tag2);
tagsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
@@ -75,8 +75,8 @@ public class AddTagsSanityTests extends RestTest
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager));
tagsAPI.addTags(document, tag1, tag2)
.assertThat().entriesListContains("tag", tag1.toLowerCase())
.and().entriesListContains("tag", tag2.toLowerCase());
.assertThat().entriesListContains("tag", tag1)
.and().entriesListContains("tag", tag2);
tagsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
@@ -87,8 +87,8 @@ public class AddTagsSanityTests extends RestTest
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator));
tagsAPI.addTags(document, tag1, tag2)
.assertThat().entriesListContains("tag", tag1.toLowerCase())
.and().entriesListContains("tag", tag2.toLowerCase());
.assertThat().entriesListContains("tag", tag1)
.and().entriesListContains("tag", tag2);
tagsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
@@ -110,8 +110,8 @@ public class AddTagsSanityTests extends RestTest
restClient.authenticateUser(userModel);
contributorDoc = dataContent.usingSite(siteModel).usingUser(userModel).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
tagsAPI.addTags(contributorDoc, tag1, tag2)
.assertThat().entriesListContains("tag", tag1.toLowerCase())
.and().entriesListContains("tag", tag2.toLowerCase());
.assertThat().entriesListContains("tag", tag1)
.and().entriesListContains("tag", tag2);
tagsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}