Merge branch '6.13' into 7.0

ezecosystem · Dec 21, 2017 · 70a2706 · 70a2706
2 parents 5ccb9bd + d2d2318
commit 70a2706
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/eZ/Publish/API/Repository/Tests/ContentServiceTest.php b/eZ/Publish/API/Repository/Tests/ContentServiceTest.php
@@ -5109,14 +5109,14 @@ public function testPublishWorkflow()
         $contentService = $repository->getContentService();
 
         $this->createRoleWithPolicies('Publisher', [
-            ['content', 'read'],
-            ['content', 'create'],
-            ['content', 'publish'],
+            ['module' => 'content', 'function' => 'read'],
+            ['module' => 'content', 'function' => 'create'],
+            ['module' => 'content', 'function' => 'publish'],
         ]);
 
         $this->createRoleWithPolicies('Writer', [
-            ['content', 'read'],
-            ['content', 'create'],
+            ['module' => 'content', 'function' => 'read'],
+            ['module' => 'content', 'function' => 'create'],
         ]);
 
         $writerUser = $this->createCustomUserWithLogin(
@@ -5153,9 +5153,9 @@ public function testPublishContentWithoutPublishPolicyThrowsException()
         $repository = $this->getRepository();
 
         $this->createRoleWithPolicies('Writer', [
-            ['content', 'read'],
-            ['content', 'create'],
-            ['content', 'edit'],
+            ['module' => 'content', 'function' => 'read'],
+            ['module' => 'content', 'function' => 'create'],
+            ['module' => 'content', 'function' => 'edit'],
         ]);
         $writerUser = $this->createCustomUserWithLogin(
             'writer',
@@ -5341,10 +5341,10 @@ public function testDeleteTranslationThrowsUnauthorizedException()
 
         // create user that can read/create/edit but cannot delete content
         $this->createRoleWithPolicies('Writer', [
-            ['content', 'read'],
-            ['content', 'versionread'],
-            ['content', 'create'],
-            ['content', 'edit'],
+            ['module' => 'content', 'function' => 'read'],
+            ['module' => 'content', 'function' => 'versionread'],
+            ['module' => 'content', 'function' => 'create'],
+            ['module' => 'content', 'function' => 'edit'],
         ]);
         $writerUser = $this->createCustomUserWithLogin(
             'writer',
@@ -5583,10 +5583,10 @@ public function testDeleteTranslationFromDraftThrowsUnauthorizedException()
 
         // create user that can read/create/delete but cannot edit or content
         $this->createRoleWithPolicies('Writer', [
-            ['content', 'read'],
-            ['content', 'versionread'],
-            ['content', 'create'],
-            ['content', 'delete'],
+            ['module' => 'content', 'function' => 'read'],
+            ['module' => 'content', 'function' => 'versionread'],
+            ['module' => 'content', 'function' => 'create'],
+            ['module' => 'content', 'function' => 'delete'],
         ]);
         $writerUser = $this->createCustomUserWithLogin(
             'user',