Merge remote-tracking branch 'origin/MAGETWO-51882-update-custom-variable' into develop

Author: dsikkema-magento

dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableForm.php

@@ -48,11 +48,11 @@ public function processAssert(
             ? $customVariable->getData()
             : array_merge($customVariableOrigin->getData(), $customVariable->getData());
         if ($customVariableOrigin !== null) {
-            $dataOrigin = $data;
+            $dataOrigin = $this->arrayCopy($data);
             $dataOrigin['html_value'] = $customVariableOrigin->getHtmlValue();
             $dataOrigin['plain_value'] = $customVariableOrigin->getPlainValue();
         } else {
-            $dataOrigin = $data;
+            $dataOrigin = $this->arrayCopy($data);
         }
         if ($data['html_value'] == '') {
             $data['html_value'] = $customVariableOrigin->getHtmlValue();
@@ -86,4 +86,20 @@ public function toString()
     {
         return 'Displayed Custom Variable data on edit page(backend) equals to passed from fixture.';
     }
+
+    /**
+     * Return a copy of the source array.
+     * To workaround an issue that an array assignment is handled by reference in PHP 7.0.5 in certain situation.
+     *
+     * @param array $sourceArray
+     * @return array
+     */
+    private function arrayCopy($sourceArray)
+    {
+        $copyArray = [];
+        foreach ($sourceArray as $key => $value) {
+            $copyArray[$key] = $value;
+        }
+        return $copyArray;
+    }
 }

dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.php

@@ -65,55 +65,46 @@ class UpdateCustomVariableEntityTest extends Injectable
      *
      * @param SystemVariableIndex $systemVariableIndex
      * @param SystemVariableNew $systemVariableNew
-     * @param SystemVariable $customVariableOrigin
-     * @param FixtureFactory $factory
-     * @return array
+     * @return void
      */
     public function __inject(
         SystemVariableIndex $systemVariableIndex,
-        SystemVariableNew $systemVariableNew,
-        SystemVariable $customVariableOrigin,
-        FixtureFactory $factory
+        SystemVariableNew $systemVariableNew
     ) {
         $this->systemVariableIndexPage = $systemVariableIndex;
         $this->systemVariableNewPage = $systemVariableNew;
-
-        $customVariableOrigin->persist();
-
-        // TODO: Move store creation to "__prepare" method after fix bug MAGETWO-29331
-        $storeOrigin = $factory->createByCode('store', ['dataset' => 'custom']);
-        $storeOrigin->persist();
-        $this->store = $storeOrigin;
-
-        return [
-            'customVariableOrigin' => $customVariableOrigin,
-            'storeOrigin' => $storeOrigin
-        ];
     }
 
     /**
      * Update Custom System Variable Entity test.
      *
+     * @param FixtureFactory $fixtureFactory
      * @param SystemVariable $customVariable
      * @param SystemVariable $customVariableOrigin
-     * @param Store $storeOrigin
      * @param string $saveAction
-     * @return void
+     * @return array
      */
     public function test(
+        FixtureFactory $fixtureFactory,
         SystemVariable $customVariable,
         SystemVariable $customVariableOrigin,
-        Store $storeOrigin,
         $saveAction
     ) {
+        $this->store = $fixtureFactory->createByCode('store', ['dataset' => 'custom']);
+        $this->store->persist();
+        $customVariableOrigin->persist();
         $filter = ['code' => $customVariableOrigin->getCode()];
 
         // Steps
         $this->systemVariableIndexPage->open();
         $this->systemVariableIndexPage->getSystemVariableGrid()->searchAndOpen($filter);
-        $this->systemVariableNewPage->getFormPageActions()->selectStoreView($storeOrigin->getData('name'));
+        $this->systemVariableNewPage->getFormPageActions()->selectStoreView($this->store->getData('name'));
         $this->systemVariableNewPage->getSystemVariableForm()->fill($customVariable);
         $this->systemVariableNewPage->getFormPageActions()->$saveAction();
+        return [
+            'storeOrigin' => $this->store,
+            'customVariableOrigin' => $customVariableOrigin
+        ];
     }
 
     /**
@@ -123,7 +114,6 @@ public function test(
      */
     public function tearDown()
     {
-        // TODO: Move store clean up to "tearDownAfterClass" method after fix bug MAGETWO-29331
         if ($this->store !== null) {
             $storeIndex = $this->objectManager->create('Magento\Backend\Test\Page\Adminhtml\StoreIndex');
             $storeIndex->open();

dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.xml

@@ -50,6 +50,7 @@
             <data name="saveAction" xsi:type="string">save</data>
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableSuccessSaveMessage" />
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInGrid" />
+            <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableForm" />
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
         </variation>
     </testCase>