test updates

dynamic · Feb 2, 2018 · b5bc2e6 · b5bc2e6
1 parent a9f001c
commit b5bc2e6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/src/Extensions/ElementalPermissions.php b/src/Extensions/ElementalPermissions.php
@@ -16,7 +16,7 @@ class ElementalPermissions extends DataExtension
      *
      * @return bool
      */
-    public function canCreate($member = null, $context = [])
+    public function canCreate($member = null)
     {
         return Permission::checkMember($member, 'Create_Element', 'any');
     }
@@ -36,7 +36,7 @@ public function canEdit($member = null)
      *
      * @return bool
      */
-    public function canDelete($member = null, $context = [])
+    public function canDelete($member = null)
     {
         return Permission::checkMember($member, 'Delete_Element', 'any');
     }
@@ -46,10 +46,8 @@ public function canDelete($member = null, $context = [])
      *
      * @return bool
      */
-    public function canPublish($member = null, $context = [])
+    public function canPublish($member = null)
     {
-        return true;
-
         return Permission::checkMember($member, 'Publish_Element', 'any');
     }
 }
diff --git a/tests/Extensions/ElementPermissionsTest.php b/tests/Extensions/ElementPermissionsTest.php
@@ -31,4 +31,4 @@ public function testProvidePermissions()
         $object = ElementContent::create();
         $this->assertTrue(is_array($object->providePermissions()));
     }
-}
+}
diff --git a/tests/Extensions/ElementalPermissionsTest.php b/tests/Extensions/ElementalPermissionsTest.php
@@ -2,12 +2,17 @@
 
 namespace Dynamic\Elements\Tests;
 
+use DNADesign\Elemental\Models\ElementalArea;
 use DNADesign\Elemental\Models\ElementContent;
+use Dynamic\Elements\Model\BaseElementObject;
+use Dynamic\Elements\ORM\ElementalPermissions;
 use Dynamic\Elements\ORM\ElementContentDataExtension;
 use Dynamic\Elements\ORM\ElementPermissions;
+use SilverStripe\Dev\Debug;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Security\Member;
+use SilverStripe\Security\Security;
 
 class ElementalPermissionsTest extends SapphireTest
 {
@@ -21,6 +26,13 @@ class ElementalPermissionsTest extends SapphireTest
      */
     protected static $required_extensions = [
         ElementContent::class => [
+            ElementPermissions::class,
+            ElementalPermissions::class,
+        ],
+        ElementalArea::class => [
+            ElementalPermissions::class,
+        ],
+        BaseElementObject::class => [
             ElementalPermissions::class,
         ],
     ];
@@ -38,29 +50,29 @@ public function testGetCMSFields()
     /**
      *
      */
-    public function testCanView()
+    public function testCanPublish()
     {
-        $object = $this->objFromFixture(ElementContent::class, 'one');
+        $object = $this->objFromFixture(ElementContent::class, 'default');
         $admin = $this->objFromFixture(Member::class, 'admin');
-        $this->assertTrue($object->canView($admin));
+        $this->assertTrue($object->canPublish($admin));
 
-        $member = $this->objFromFixture(Member::class, 'default');
-        $this->assertFalse($object->canView($member));
+        $member = $this->objFromFixture(Member::class, 'site-owner');
+        $this->assertFalse($object->canPublish($member->ID));
 
         Security::setCurrentUser();
-        $this->assertFalse($object->canView());
+        $this->assertFalse($object->canPublish());
     }
 
     /**
      *
      */
     public function testCanEdit()
     {
-        $object = $this->objFromFixture(ElementContent::class, 'one');
+        $object = $this->objFromFixture(ElementContent::class, 'default');
         $admin = $this->objFromFixture(Member::class, 'admin');
         $this->assertTrue($object->canEdit($admin));
 
-        $member = $this->objFromFixture(Member::class, 'default');
+        $member = $this->objFromFixture(Member::class, 'site-owner');
         $this->assertFalse($object->canEdit($member));
 
         Security::setCurrentUser();
@@ -72,12 +84,12 @@ public function testCanEdit()
      */
     public function testCanDelete()
     {
-        $object = $this->objFromFixture(ElementContent::class, 'one');
+        $object = $this->objFromFixture(ElementContent::class, 'default');
         $admin = $this->objFromFixture(Member::class, 'admin');
         $this->assertTrue($object->canDelete($admin));
 
-        $member = $this->objFromFixture(Member::class, 'default');
-        $this->assertFalse($object->canDelete($member));
+        $member = $this->objFromFixture(Member::class, 'site-owner');
+        $this->assertFalse($object->canDelete($member->ID));
 
         Security::setCurrentUser();
         $this->assertFalse($object->canDelete());
@@ -88,12 +100,12 @@ public function testCanDelete()
      */
     public function testCanCreate()
     {
-        $object = $this->objFromFixture(ElementContent::class, 'one');
+        $object = $this->objFromFixture(ElementContent::class, 'default');
         $admin = $this->objFromFixture(Member::class, 'admin');
         $this->assertTrue($object->canCreate($admin));
 
-        $member = $this->objFromFixture(Member::class, 'default');
-        $this->assertFalse($object->canCreate($member));
+        $member = $this->objFromFixture(Member::class, 'site-owner');
+        $this->assertFalse($object->canCreate($member->ID));
 
         Security::setCurrentUser();
         $this->assertFalse($object->canCreate());