Merge branch 'TAS-949' of gitlab.alfresco.com:tas/alfresco-tas-restapi-test

# Conflicts:
#	src/main/java/org/alfresco/rest/model/RestCommentModelsCollection.java
#	src/main/java/org/alfresco/rest/model/RestPersonModel.java
#	src/main/java/org/alfresco/rest/requests/RestCommentsApi.java
#	src/main/java/org/alfresco/rest/requests/RestSitesApi.java
#	src/test/java/org/alfresco/rest/demo/RestDemoTests.java
This commit is contained in:
Paul Brodner
2016-09-29 16:56:54 +03:00
7 changed files with 19 additions and 24 deletions

View File

@@ -36,7 +36,7 @@ public class GetSiteContainersSanityTests extends RestTest
private ListUserWithRoles usersWithRoles;
private UserModel userModel;
@BeforeClass
@BeforeClass(alwaysRun=true)
public void dataPreparation() throws Exception
{
adminUserModel = dataUser.getAdminUser();