MAGETWO-91529: Restricted admin user can remove product from other websites

Joan He · Joan He · commit 507051b367fe · 2018-06-11T21:21:40.000-05:00
- Fix static test failures
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php
@@ -99,8 +99,11 @@ public function testModifyMetaLocked($locked)
             ->method('isLockedAttribute')
             ->willReturn($locked);
         $modifyMeta = $this->getModel()->modifyMeta([AbstractModifier::DEFAULT_GENERAL_PANEL => []]);
-        $this->assertEquals($locked,
-            $modifyMeta[AbstractModifier::DEFAULT_GENERAL_PANEL]['children']['attribute_set_id']['arguments']['data']['config']['disabled']);
+        $children = $modifyMeta[AbstractModifier::DEFAULT_GENERAL_PANEL]['children'];
+        $this->assertEquals(
+            $locked,
+            $children['attribute_set_id']['arguments']['data']['config']['disabled']
+        );
     }
 
     public function modifyMetaLockedDataProvider()
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
@@ -546,6 +546,7 @@ function ($value) use ($attributeOptionsExpected) {
 
     /**
      * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function setupAttributeMetaDataProvider()
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -41,6 +41,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
  * @since 101.0.0
  */
 class Eav extends AbstractModifier

Original file line number	Diff line number	Diff line change
`@@ -546,6 +546,7 @@ function ($value) use ($attributeOptionsExpected) {`
`546`	`546`
`547`	`547`	`/**`
`548`	`548`	`* @return array`
	`549`	`+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)`
`549`	`550`	`*/`
`550`	`551`	`public function setupAttributeMetaDataProvider()`
`551`	`552`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`*`
`42`	`42`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`43`	`43`	`* @SuppressWarnings(PHPMD.TooManyFields)`
	`44`	`+ * @SuppressWarnings(PHPMD.NPathComplexity)`
`44`	`45`	`* @since 101.0.0`
`45`	`46`	`*/`
`46`	`47`	`class Eav extends AbstractModifier`