MAGETWO-98202: Additional Permissions for Design settings

Author: OlgaVasyltsun

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -651,19 +651,19 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
         }
 
         //Checking access to design config.
-        if (in_array($attributeCode, $this->designAttributeCodes, true)) {
-            if (!$this->authorization->isAllowed('Magento_Catalog::edit_product_design')) {
-                $meta = $this->arrayManager->merge(
-                    $configPath,
-                    $meta,
-                    [
-                        'disabled' => true,
-                        'validation' => ['required' => false],
-                        'required' => false,
-                        'serviceDisabled' => true,
-                    ]
-                );
-            }
+        if (in_array($attributeCode, $this->designAttributeCodes, true)
+            && !$this->authorization->isAllowed('Magento_Catalog::edit_product_design')
+        ) {
+            $meta = $this->arrayManager->merge(
+                $configPath,
+                $meta,
+                [
+                    'disabled' => true,
+                    'validation' => ['required' => false],
+                    'required' => false,
+                    'serviceDisabled' => true,
+                ]
+            );
         }
 
         return $meta;

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php

@@ -9,6 +9,7 @@
 use Magento\Backend\Model\Auth;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Framework\Acl\Builder;
+use Magento\Framework\Acl\CacheInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Bootstrap as TestBootstrap;
 
@@ -34,6 +35,11 @@ class CategoryRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     private $aclBuilder;
 
+    /**
+     * @var CacheInterface
+     */
+    private $aclCache;
+
     /**
      * Sets up common objects.
      *
@@ -44,6 +50,7 @@ protected function setUp()
         $this->repository = Bootstrap::getObjectManager()->create(CategoryRepositoryInterface::class);
         $this->authorization = Bootstrap::getObjectManager()->get(Auth::class);
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
+        $this->aclCache = Bootstrap::getObjectManager()->get(CacheInterface::class);
     }
 
     /**
@@ -54,6 +61,7 @@ protected function tearDown()
         parent::tearDown();
 
         $this->authorization->logout();
+        $this->aclCache->clean();
     }
 
     /**

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php

@@ -11,6 +11,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Bootstrap as TestBootstrap;
 use Magento\Framework\Acl\Builder;
+use Magento\Framework\Acl\CacheInterface;
 
 /**
  * Provide tests for ProductRepository model.
@@ -37,6 +38,11 @@ class ProductRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     private $aclBuilder;
 
+    /**
+     * @var CacheInterface
+     */
+    private $aclCache;
+
     /**
      * @inheritdoc
      */
@@ -45,6 +51,7 @@ protected function setUp()
         $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
         $this->authorization = Bootstrap::getObjectManager()->get(Auth::class);
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
+        $this->aclCache = Bootstrap::getObjectManager()->get(CacheInterface::class);
     }
 
     /**
@@ -55,6 +62,7 @@ protected function tearDown()
         parent::tearDown();
 
         $this->authorization->logout();
+        $this->aclCache->clean();
     }
 
     /**

dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\TestFramework\Bootstrap as TestBootstrap;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Acl\CacheInterface;
 
 /**
  * Test class for page repository.
@@ -46,6 +47,11 @@ class PageRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     private $pageCollectionFactory;
 
+    /**
+     * @var CacheInterface
+     */
+    private $aclCache;
+
     /**
      * Sets up common objects.
      *
@@ -58,6 +64,8 @@ protected function setUp()
         $this->criteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
         $this->pageCollectionFactory = Bootstrap::getObjectManager()->get(PageCollectionFactory::class);
+        $this->aclCache = Bootstrap::getObjectManager()->get(CacheInterface::class);
+        $this->aclCache->clean();
     }
 
     /**