permission - switch from checkMember to check

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

Hide file tree

Showing 3 changed files with 28 additions and 20 deletions.
diff --git a/src/Extensions/ElementalPermissions.php b/src/Extensions/ElementalPermissions.php
@@ -18,7 +18,7 @@ class ElementalPermissions extends DataExtension
      */
     public function canCreate($member = null)
     {
-        return Permission::checkMember($member, 'Create_Element', 'any');
+        return Permission::check('Create_Element', 'any', $member);
     }
 
     /**
@@ -28,7 +28,7 @@ public function canCreate($member = null)
      */
     public function canEdit($member = null)
     {
-        return Permission::checkMember($member, 'Edit_Element', 'any');
+        return Permission::check('Edit_Element', 'any', $member);
     }
 
     /**
@@ -38,7 +38,7 @@ public function canEdit($member = null)
      */
     public function canDelete($member = null)
     {
-        return Permission::checkMember($member, 'Delete_Element', 'any');
+        return Permission::check('Delete_Element', 'any', $member);
     }
 
     /**
@@ -48,6 +48,6 @@ public function canDelete($member = null)
      */
     public function canPublish($member = null)
     {
-        return Permission::checkMember($member, 'Publish_Element', 'any');
+        return Permission::check('Publish_Element', 'any', $member);
     }
 }
diff --git a/tests/Extensions/ElementalPermissionsTest.php b/tests/Extensions/ElementalPermissionsTest.php
@@ -2,12 +2,14 @@
 
 namespace Dynamic\Elements\Tests;
 
+use DNADesign\Elemental\Models\BaseElement;
 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 Dynamic\Elements\Tests\TestOnly\TestElementContent;
 use SilverStripe\Dev\Debug;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\FieldList;
@@ -24,25 +26,16 @@ class ElementalPermissionsTest extends SapphireTest
     /**
      * @var array
      */
-    protected static $required_extensions = [
-        ElementContent::class => [
-            ElementPermissions::class,
-            ElementalPermissions::class,
-        ],
-        ElementalArea::class => [
-            ElementalPermissions::class,
-        ],
-        BaseElementObject::class => [
-            ElementalPermissions::class,
-        ],
+    protected static $extra_dataobjects = [
+        TestElementContent::class,
     ];
 
     /**
      *
      */
     public function testGetCMSFields()
     {
-        $object = $this->objFromFixture(ElementContent::class, 'default');
+        $object = TestElementContent::create();
         $fields = $object->getCMSFields();
         $this->assertInstanceOf(FieldList::class, $fields);
     }
@@ -52,7 +45,7 @@ public function testGetCMSFields()
      */
     public function testCanPublish()
     {
-        $object = $this->objFromFixture(ElementContent::class, 'default');
+        $object = TestElementContent::create();
         $admin = $this->objFromFixture(Member::class, 'admin');
         $this->assertTrue($object->canPublish($admin));
 
@@ -68,7 +61,7 @@ public function testCanPublish()
      */
     public function testCanEdit()
     {
-        $object = $this->objFromFixture(ElementContent::class, 'default');
+        $object = TestElementContent::create();
         $admin = $this->objFromFixture(Member::class, 'admin');
         $this->assertTrue($object->canEdit($admin));
 
@@ -84,7 +77,7 @@ public function testCanEdit()
      */
     public function testCanDelete()
     {
-        $object = $this->objFromFixture(ElementContent::class, 'default');
+        $object = TestElementContent::create();
         $admin = $this->objFromFixture(Member::class, 'admin');
         $this->assertTrue($object->canDelete($admin));
 
@@ -100,7 +93,7 @@ public function testCanDelete()
      */
     public function testCanCreate()
     {
-        $object = $this->objFromFixture(ElementContent::class, 'default');
+        $object = TestElementContent::create();
         $admin = $this->objFromFixture(Member::class, 'admin');
         $this->assertTrue($object->canCreate($admin));
 

diff --git a/tests/TestOnly/TestElementContent.php b/tests/TestOnly/TestElementContent.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Dynamic\Elements\Tests\TestOnly;
+
+use DNADesign\Elemental\Models\ElementContent;
+use Dynamic\Elements\ORM\ElementalPermissions;
+use SilverStripe\Dev\TestOnly;
+use SilverStripe\ORM\DataObject;
+
+class TestElementContent extends DataObject implements TestOnly
+{
+    private static $extensions = [
+        ElementalPermissions::class,
+    ];
+}