Merge pull request #1241 from magento-tsg/2.1.8-develop-pr20

wert2all · web-flow · commit 0ad989128d11 · 2017-06-29T15:03:09.000+03:00
[TSG] Backporting for 2.1 (pr20) (2.1.8)
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php
@@ -38,13 +38,16 @@ public function beforeSave($object)
      */
     public function validate($object)
     {
-        $attributeCode = $this->getAttribute()->getAttributeCode();
+        $attribute = $this->getAttribute();
+        $attributeCode = $attribute->getAttributeCode();
         $data = $object->getData($attributeCode);
+        $assigned = $object->hasData($attributeCode);
         if (is_array($data)) {
             $object->setData($attributeCode, implode(',', array_filter($data)));
-        } elseif (empty($data)) {
+        } elseif (empty($data) && $assigned) {
             $object->setData($attributeCode, null);
         }
+
         return parent::validate($object);
     }
 }
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
@@ -346,8 +346,14 @@ private function getAllSizeImages(ModelProduct $product, $imageFile)
      */
     private function getSwatchAttributes(Product $product)
     {
-        $swatchAttributes = $this->swatchAttributesProvider->provide($product);
-        return $swatchAttributes;
+        $attributes = $this->swatchAttributesProvider->provide($product) ?: [];
+        foreach ($attributes as $attribute) {
+            if (!$attribute->hasData(Swatch::SWATCH_INPUT_TYPE_KEY)) {
+                $this->populateAdditionalDataEavAttribute($attribute);
+            }
+        }
+
+        return $attributes;
     }
 
     /**
diff --git a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
@@ -552,7 +552,10 @@ public function testGetSwatchAttributesAsArray($optionsArray, $attributeData, $e
         $storeMock->method('getId')->willReturn($storeId);
         $this->storeManagerMock->method('getStore')->willReturn($storeMock);
 
-        $this->attributeMock->method('getData')->with('')->willReturn($attributeData);
+        $this->attributeMock
+            ->method('getData')
+            ->withConsecutive(['additional_data'], [''])
+            ->will($this->onConsecutiveCalls('', $attributeData));
 
         $sourceMock = $this->getMock(
             \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource::class,
diff --git a/app/code/Magento/Tax/Setup/InstallData.php b/app/code/Magento/Tax/Setup/InstallData.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Tax\Setup;
 
+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
@@ -22,14 +23,32 @@ class InstallData implements InstallDataInterface
      */
     private $taxSetupFactory;
 
+    /**
+     * Region collection factory.
+     *
+     * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
+     */
+    private $regionCollectionFactory;
+
+    /**
+     * Region collection.
+     *
+     * @var \Magento\Directory\Model\ResourceModel\Region\Collection
+     */
+    private $regionCollection;
+
     /**
      * Init
      *
      * @param TaxSetupFactory $taxSetupFactory
+     * @param CollectionFactory $collectionFactory
      */
-    public function __construct(TaxSetupFactory $taxSetupFactory)
-    {
+    public function __construct(
+        TaxSetupFactory $taxSetupFactory,
+        CollectionFactory $collectionFactory
+    ) {
         $this->taxSetupFactory = $taxSetupFactory;
+        $this->regionCollectionFactory = $collectionFactory;
     }
 
     /**
@@ -101,22 +120,48 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
             [
                 'tax_calculation_rate_id' => 1,
                 'tax_country_id' => 'US',
-                'tax_region_id' => 12,
+                'tax_region_id' => $this->getRegionId('CA'),
                 'tax_postcode' => '*',
                 'code' => 'US-CA-*-Rate 1',
                 'rate' => '8.2500',
             ],
             [
                 'tax_calculation_rate_id' => 2,
                 'tax_country_id' => 'US',
-                'tax_region_id' => 43,
+                'tax_region_id' => $this->getRegionId('NY'),
                 'tax_postcode' => '*',
                 'code' => 'US-NY-*-Rate 1',
                 'rate' => '8.3750'
             ],
         ];
+
         foreach ($data as $row) {
             $setup->getConnection()->insertForce($setup->getTable('tax_calculation_rate'), $row);
         }
     }
+
+    /**
+     * Return region id by code.
+     * 
+     * @param string $regionCode
+     * @return string
+     */
+    private function getRegionId($regionCode)
+    {
+        if ($this->regionCollection === null) {
+            /** @var \Magento\Directory\Model\ResourceModel\Region\Collection $regionCollection */
+            $this->regionCollection = $this->regionCollectionFactory->create();
+            $this->regionCollection->addCountryFilter('US')
+                ->addRegionCodeOrNameFilter(['CA', 'NY']);
+        }
+
+        $regionId = '';
+        /** @var \Magento\Directory\Model\Region $item */
+        $item = $this->regionCollection->getItemByColumnValue('code', $regionCode);
+        if ($item) {
+            $regionId = $item->getId();
+        }
+
+        return $regionId;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Source/Date.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Source/Date.php
@@ -6,15 +6,13 @@
 
 namespace Magento\Backend\Test\Fixture\Source;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Mtf\Fixture\DataSource;
 
 /**
  * Class Date.
  *
  * Data keys:
  *  - pattern (Format a local time/date with delta, e.g. 'm/d/Y -3 days' = current day - 3 days)
- *  - apply_timezone (true if it is needed to apply timezone)
  */
 class Date extends DataSource
 {
@@ -37,17 +35,7 @@ public function __construct(array $params, $data = [])
             if (!$timestamp) {
                 throw new \Exception('Invalid date format for "' . $this->params['attribute_code'] . '" field');
             }
-            if (isset($data['apply_timezone']) && $data['apply_timezone'] === true) {
-
-                $timezone = ObjectManager::getInstance()
-                    ->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
-                $date = new \DateTime();
-                $date->setTimestamp($timestamp);
-                $date->setTimezone(new \DateTimeZone($timezone->getConfigTimezone()));
-                $date = $date->format(str_replace($delta, '', $data['pattern']));
-            } else {
-                $date = date(str_replace($delta, '', $data['pattern']), $timestamp);
-            }
+            $date = date(str_replace($delta, '', $data['pattern']), $timestamp);
             if (!$date) {
                 $date = date('m/d/Y');
             }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
@@ -76,6 +76,13 @@ class Grid extends DataGrid
      */
     protected $firstRowSelector = '//tbody/tr[1]/td[contains(@class,"data-grid-actions-cell")]/a';
 
+    /**
+     * Global seach block selector.
+     *
+     * @var string
+     */
+    private $globalSearch = '.search-global';
+
     /**
      * Start to create new order.
      *
@@ -106,4 +113,33 @@ public function getPurchasePointStoreGroups()
 
         return $result;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function selectItems(array $items, $isSortable = true)
+    {
+        if ($isSortable) {
+            $this->sortGridByField('ID');
+        }
+        foreach ($items as $item) {
+            //Hover on search block is made to avoid click on invisible element currentPage
+            $searchBlock = $this->browser->find($this->globalSearch);
+            $searchBlock->hover();
+            $this->_rootElement->find($this->currentPage, Locator::SELECTOR_XPATH)->setValue('');
+            $this->waitLoader();
+            $selectItem = $this->getRow($item)->find($this->selectItem);
+            do {
+                if ($selectItem->isVisible()) {
+                    if (!$selectItem->isSelected()) {
+                        $selectItem->click();
+                    }
+                    break;
+                }
+            } while ($this->nextPage());
+            if (!$selectItem->isVisible()) {
+                throw new \Exception("Searched item was not found\n" . print_r($item, true));
+            }
+        }
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
@@ -346,10 +346,23 @@ public function selectMassAction($massActionSelection)
     public function selectAction($action)
     {
         $actionType = is_array($action) ? key($action) : $action;
-        $this->getGridHeaderElement()->find($this->actionButton)->click();
-        $this->getGridHeaderElement()
-            ->find(sprintf($this->actionList, $actionType), Locator::SELECTOR_XPATH)
-            ->click();
+        // Find Action button (dropdown actually)
+        $actionButton = $this->getGridHeaderElement()->find($this->actionButton);
+        // Click it to show options (actions)
+        $actionButton->click();
+        // Find needed element (action) to click on
+        $actionElement = $this->getGridHeaderElement()
+            ->find(sprintf($this->actionList, $actionType), Locator::SELECTOR_XPATH);
+        // Scroll to show it (action option) on viewport. It can be out of viewport because of small window height.
+        $actionElement->hover();
+        // In case of small window after scroll to action element it may became hidden
+        // It because of appearance special top-stick panel of actions
+        // So we need to click action button again to show list of actions
+        if (!$actionElement->isVisible()) {
+            $actionButton->click();
+        }
+        // Click on action element to run appropriate command
+        $actionElement->click();
         if (is_array($action)) {
             $this->getGridHeaderElement()
                 ->find(sprintf($this->actionList, end($action)), Locator::SELECTOR_XPATH)
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertAdminUrlNoAccess.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertAdminUrlNoAccess.php
@@ -28,13 +28,10 @@ class AssertAdminUrlNoAccess extends AbstractConstraint
      *
      * @var array
      */
-    private $urls = [
+    protected $urls = [
         'mui/index/render/?namespace=cms_block_listing&search=&filters%5Bplaceholder%5D=true'
         . '&paging%5BpageSize%5D=20&paging%5Bcurrent%5D=1&sorting%5Bfield%5D=block_id'
         . '&sorting%5Bdirection%5D=asc&isAjax=true',
-        'mui/index/render/handle/bulk_bulk_details_modal/buttons/1/?namespace=support_report_listing'
-        . '&filters%5Bplaceholder%5D=true&paging%5BpageSize%5D=20&paging%5Bcurrent%5D=1&sorting%5Bfield%5D=report_id'
-        . '&sorting%5Bdirection%5D=asc&isAjax=true',
         'mui/index/render/?namespace=customer_listing&search=&filters%5Bplaceholder%5D=true'
         . '&paging%5BpageSize%5D=20&paging%5Bcurrent%5D=1&sorting%5Bfield%5D=entity_id&sorting%5Bdirection%5D=asc'
         . '&isAjax=true',
diff --git a/dev/tests/functional/tests/app/Magento/Webapi/Test/Constraint/AssertWebapiNoAccessByCookie.php b/dev/tests/functional/tests/app/Magento/Webapi/Test/Constraint/AssertWebapiNoAccessByCookie.php
@@ -41,10 +41,12 @@ public function processAssert(
     ) {
         // Create and login a customer on frontend
         $customer->persist();
-        $this->objectManager->create(
-            'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep',
+        /** @var \Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep $customerLoginStep */
+        $customerLoginStep = $this->objectManager->create(
+            \Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class,
             ['customer' => $customer]
-        )->run();
+        );
+        $customerLoginStep->run();
 
         // Go to cms page with form as logged in customer and submit request
         $browser->open($_ENV['app_frontend_url'] . $cms->getIdentifier());
@@ -55,6 +57,8 @@ public function processAssert(
             $browser->getHtmlSource(),
             'Customer should not have customer webapi access through cookies.'
         );
+
+        $customerLoginStep->cleanup();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Webapi/Test/TestCase/CustomerWebapisPermissionTest.php b/dev/tests/functional/tests/app/Magento/Webapi/Test/TestCase/CustomerWebapisPermissionTest.php
@@ -82,28 +82,33 @@ public function __inject(
             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
             ['configData' => 'wysiwyg_disabled']
         )->run();
+
         return ['cmsOriginal' => $cmsOriginal];
     }
 
     /**
      * Construct cms page with a form that contains webapi request and 'Submit Request' button.
      *
      * @param CmsPage $cmsOriginal
+     * @param string $url
+     * @param string $method
      * @return array
      */
-    public function test(CmsPage $cmsOriginal)
+    public function test(CmsPage $cmsOriginal, $url, $method = 'POST')
     {
         $this->cmsPageIndex->open();
         $this->cmsPageIndex->getCmsPageGridBlock()->searchAndOpen(['title' => $cmsOriginal->getTitle()]);
         $data = $cmsOriginal->getData();
-        $content = '<p><form action="'
-            . $_ENV['app_frontend_url']
-            . 'rest/V1/carts/mine/balance/apply" method="POST">'
-            . '<input type="submit" value="Submit Request" /></form></p>';
+        $content = <<<HTML
+            <form action="$url" method="$method" >
+                <input type="submit" value="Submit Request" />
+            </form>
+HTML;
         $data['content'] = ['content' => $content];
         $cms = $this->factory->createByCode('cmsPage', ['data' => $data]);
         $this->cmsPageNew->getPageForm()->fill($cms);
         $this->cmsPageNew->getPageMainActions()->save();
+        
         return ['cms' => $cms];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Webapi/Test/TestCase/CustomerWebapisPermissionTest.xml b/dev/tests/functional/tests/app/Magento/Webapi/Test/TestCase/CustomerWebapisPermissionTest.xml
@@ -8,6 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Webapi\Test\TestCase\CustomerWebapisPermissionTest" summary="Customer Webapi Permission Test" ticketId="MAGETWO-64389">
         <variation name="CustomerWebapisPermissionTestVariation1">
+            <data name="url">rest/V1/carts/mine</data>
+            <data name="method">POST</data>
             <constraint name="Magento\Webapi\Test\Constraint\AssertWebapiNoAccessByCookie" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/utils/command.php b/dev/tests/functional/utils/command.php
@@ -14,8 +14,10 @@
 
 if (isset($_GET['command'])) {
     $command = urldecode($_GET['command']);
-    if (in_array(explode(' ', $command)[0], $commandList)) {
-        exec('php -f ../../../../bin/magento ' . $command);
+    if (!strpos($command, '&&') && !strpos($command, ';')) {
+        if (in_array(explode(' ', $command)[0], $commandList)) {
+            exec('php -f ../../../../bin/magento ' . $command);
+        }
     }
 } else {
     throw new \InvalidArgumentException("Command GET parameter is not set.");
diff --git a/dev/tests/integration/testsuite/Magento/Security/Model/Plugin/AuthSessionTest.php b/dev/tests/integration/testsuite/Magento/Security/Model/Plugin/AuthSessionTest.php
@@ -40,6 +40,13 @@ class AuthSessionTest extends \PHPUnit_Framework_TestCase
      */
     protected $dateTime;
 
+    /**
+     * Session Manager.
+     *
+     * @var \Magento\Framework\Session\SessionManager
+     */
+    private $sessionManager;
+
     /**
      * Set up
      */
@@ -48,14 +55,15 @@ protected function setUp()
         parent::setUp();
 
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->objectManager->get('Magento\Framework\Config\ScopeInterface')
+        $this->sessionManager = $this->objectManager->create(\Magento\Framework\Session\SessionManager::class);
+        $this->objectManager->get(\Magento\Framework\Config\ScopeInterface::class)
             ->setCurrentScope(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
-        $this->auth = $this->objectManager->create('Magento\Backend\Model\Auth');
-        $this->authSession = $this->objectManager->create('Magento\Backend\Model\Auth\Session');
-        $this->adminSessionInfo = $this->objectManager->create('Magento\Security\Model\AdminSessionInfo');
+        $this->auth = $this->objectManager->create(\Magento\Backend\Model\Auth::class);
+        $this->authSession = $this->objectManager->create(\Magento\Backend\Model\Auth\Session::class);
+        $this->adminSessionInfo = $this->objectManager->create(\Magento\Security\Model\AdminSessionInfo::class);
         $this->auth->setAuthStorage($this->authSession);
-        $this->adminSessionsManager = $this->objectManager->create('Magento\Security\Model\AdminSessionsManager');
-        $this->dateTime = $this->objectManager->create('Magento\Framework\Stdlib\DateTime');
+        $this->adminSessionsManager = $this->objectManager->create(\Magento\Security\Model\AdminSessionsManager::class);
+        $this->dateTime = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime::class);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Helper/DataTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/magento_image.jpg b/dev/tests/integration/testsuite/Magento/Swatches/_files/magento_image.jpg

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,16 @@ public function beforeSave($object)`
`38`	`38`	`*/`
`39`	`39`	`public function validate($object)`
`40`	`40`	`{`
`41`		`- $attributeCode = $this->getAttribute()->getAttributeCode();`
	`41`	`+ $attribute = $this->getAttribute();`
	`42`	`+ $attributeCode = $attribute->getAttributeCode();`
`42`	`43`	`$data = $object->getData($attributeCode);`
	`44`	`+ $assigned = $object->hasData($attributeCode);`
`43`	`45`	`if (is_array($data)) {`
`44`	`46`	`$object->setData($attributeCode, implode(',', array_filter($data)));`
`45`		`- } elseif (empty($data)) {`
	`47`	`+ } elseif (empty($data) && $assigned) {`
`46`	`48`	`$object->setData($attributeCode, null);`
`47`	`49`	`}`
	`50`	`+`
`48`	`51`	`return parent::validate($object);`
`49`	`52`	`}`
`50`	`53`	`}`