Merge pull request magento#20 from magento-nord/develop

Oleksii Korshenko · Oleksii Korshenko · commit b311c280ef4b · 2016-06-07T14:15:39.000-05:00
[NORD] Bugfixes
diff --git a/app/code/Magento/CatalogRuleSampleData/etc/module.xml b/app/code/Magento/CatalogRuleSampleData/etc/module.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Magento_CatalogRuleSampleData" setup_version="2.0.0">
         <sequence>
-            <module name="Magento_CatalogRule"/>
+            <module name="Magento_CatalogRuleConfigurable"/>
             <module name="Magento_SampleData"/>
             <module name="Magento_ConfigurableSampleData"/>
         </sequence>
diff --git a/app/code/Magento/CatalogSampleData/Model/Attribute.php b/app/code/Magento/CatalogSampleData/Model/Attribute.php
@@ -132,7 +132,7 @@ public function install(array $fixtures)
                 $data['backend_model'] = $this->productHelper->getAttributeBackendModelByInputType(
                     $data['frontend_input']
                 );
-                $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0, 'apply_to' => []];
+                $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0];
                 $data['backend_type'] = $attribute->getBackendTypeByInput($data['frontend_input']);
 
                 $attribute->addData($data);
@@ -149,9 +149,8 @@ public function install(array $fixtures)
                         $attributeSet = $this->processAttributeSet($setName);
                         $attributeGroupId = $attributeSet->getDefaultGroupId();
 
-                        $attribute = $this->attributeFactory->create();
+                        $attribute = $this->attributeFactory->create()->load($attributeId);
                         $attribute
-                            ->setId($attributeId)
                             ->setAttributeGroupId($attributeGroupId)
                             ->setAttributeSetId($attributeSet->getId())
                             ->setEntityTypeId($this->getEntityTypeId())
diff --git a/app/code/Magento/CatalogSampleData/Model/Product/Gallery.php b/app/code/Magento/CatalogSampleData/Model/Product/Gallery.php
@@ -8,6 +8,8 @@
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Gallery as GalleryResource;
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * Class Gallery
@@ -44,6 +46,11 @@ class Gallery
      */
     protected $eavConfig;
 
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param SampleDataContext $sampleDataContext
      * @param ProductFactory $productFactory
@@ -111,6 +118,8 @@ public function setFixtures(array $fixtures)
      */
     protected function storeImage($product, $images)
     {
+        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+        $productId = $product->getData($linkField);
         $baseImage = '';
         $i = 1;
         $mediaAttribute = $this->eavConfig->getAttribute('catalog_product', 'media_gallery');
@@ -122,20 +131,20 @@ protected function storeImage($product, $images)
             if (strpos($image, '_main') !== false) {
                 $baseImage = $image;
             }
+
             $id = $this->galleryResource->insertGallery([
                 'attribute_id' => $mediaAttribute->getAttributeId(),
-                'entity_id' => $product->getId(),
                 'value' => $image,
             ]);
             $this->galleryResource->insertGalleryValueInStore([
                 'value_id' => $id,
                 'store_id' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
-                'entity_id' => $product->getId(),
+                $linkField => $productId,
                 'label' => 'Image',
                 'position' => $i,
                 'disables' => 0,
             ]);
-            $this->galleryResource->bindValueToEntity($id, $product->getId());
+            $this->galleryResource->bindValueToEntity($id, $productId);
             $i++;
         }
 
@@ -152,12 +161,28 @@ protected function storeImage($product, $images)
                 $table = $imageAttribute->getBackend()->getTable();
                 /** @var \Magento\Framework\DB\Adapter\AdapterInterface $adapter*/
                 $data = [
-                    $attribute->getEntity()->getLinkField() => $product->getId(),
+                    $attribute->getEntity()->getLinkField() => $productId,
                     'attribute_id' => $attribute->getId(),
                     'value' => $baseImage,
                 ];
                 $adapter->insertOnDuplicate($table, $data, ['value']);
             }
         }
     }
+
+    /**
+     * @deprecated
+     *
+     * @return \Magento\Framework\EntityManager\MetadataPool|mixed
+     */
+    private function getMetadataPool()
+    {
+        if (!($this->metadataPool)) {
+            return ObjectManager::getInstance()->get(
+                '\Magento\Framework\EntityManager\MetadataPool'
+            );
+        } else {
+            return $this->metadataPool;
+        }
+    }
 }
diff --git a/app/code/Magento/ConfigurableSampleData/composer.json b/app/code/Magento/ConfigurableSampleData/composer.json
@@ -5,8 +5,7 @@
         "php": "~5.5.0|~5.6.0|~7.0.0",
         "magento/module-configurable-product": "100.1.*",
         "magento/module-sample-data": "100.1.*",
-        "magento/module-product-links-sample-data": "100.1.*",
-        "magento/module-sales-sample-data": "100.1.*"
+        "magento/module-product-links-sample-data": "100.1.*"
     },
     "type": "magento2-module",
     "version": "100.1.0-rc1",
diff --git a/app/code/Magento/DownloadableSampleData/Model/Product/Converter.php b/app/code/Magento/DownloadableSampleData/Model/Product/Converter.php
@@ -5,11 +5,25 @@
  */
 namespace Magento\DownloadableSampleData\Model\Product;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem;
+
 /**
  * Class Converter
  */
 class Converter extends \Magento\CatalogSampleData\Model\Product\Converter
 {
+    /**
+     * @var \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory
+     */
+    private $fileContentFactory;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
     /**
      * Get downloadable data from array
      *
@@ -84,7 +98,11 @@ public function formatDownloadableLinkData($linkData)
         foreach ($linkItems as $csvRow) {
             $linkData[$csvRow] = isset($linkData[$csvRow]) ? $linkData[$csvRow] : '';
         }
-
+        $directory = $this->getFilesystem()->getDirectoryRead(DirectoryList::MEDIA);
+        $linkPath = $directory->getAbsolutePath('downloadable/files/links' . $linkData['link_item_file']);
+        $data = base64_encode(file_get_contents($linkPath));
+        $content = $this->getFileContent()->setFileData($data)
+            ->setName('luma_background_-_model_against_fence_4_sec_.mp4');
         $link = [
             'is_delete' => '',
             'link_id' => '0',
@@ -95,6 +113,7 @@ public function formatDownloadableLinkData($linkData)
             'type' => 'file',
             'file' => json_encode([['file' => $linkData['link_item_file'], 'status' => 'old']]),
             'sort_order' => '',
+            'link_file_content' => $content
         ];
 
         return $link;
@@ -106,6 +125,13 @@ public function formatDownloadableLinkData($linkData)
      */
     public function getSamplesInfo()
     {
+        $directory = $this->getFilesystem()->getDirectoryRead(DirectoryList::MEDIA);
+        $linkPath = $directory->getAbsolutePath(
+            'downloadable/files/samples/l/u/luma_background_-_model_against_fence_4_sec_.mp4'
+        );
+        $data = base64_encode(file_get_contents($linkPath));
+        $content = $this->getFileContent()->setFileData($data)
+            ->setName('luma_background_-_model_against_fence_4_sec_.mp4');
         $sample = [
             'is_delete' => '',
             'sample_id' => '0',
@@ -115,6 +141,7 @@ public function getSamplesInfo()
             ]]),
             'type' => 'file',
             'sort_order' => '',
+            'sample_file_content' => $content
         ];
 
         $samples = [];
@@ -125,4 +152,32 @@ public function getSamplesInfo()
 
         return $samples;
     }
+
+    /**
+     * @return \Magento\Downloadable\Api\Data\File\ContentInterface
+     * @deprecated
+     */
+    private function getFileContent()
+    {
+        if (!$this->fileContentFactory) {
+            $this->fileContentFactory = ObjectManager::getInstance()->create(
+                \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class
+            );
+        }
+        return $this->fileContentFactory->create();
+    }
+
+    /**
+     * @return Filesystem
+     * @deprecated
+     */
+    private function getFilesystem()
+    {
+        if (!$this->filesystem) {
+            $this->filesystem = ObjectManager::getInstance()->create(
+                Filesystem::class
+            );
+        }
+        return $this->filesystem;
+    }
 }
diff --git a/app/code/Magento/SalesSampleData/Model/Order/Processor.php b/app/code/Magento/SalesSampleData/Model/Order/Processor.php
@@ -130,13 +130,15 @@ public function createOrder($orderData)
     {
         $this->setPhraseRenderer();
         if (!empty($orderData)) {
-            $orderCreateModel = $this->processQuote($orderData);
+            $this->currentSession = $this->sessionQuoteFactory->create();
             $customer = $this->customerRepository->get(
                 $orderData['order']['account']['email'],
                 $this->storeManager->getWebsite()->getId()
             );
+            $this->currentSession->setCustomerId($customer->getId());
+            $orderCreateModel = $this->processQuote($orderData);
             $orderCreateModel->getQuote()->setCustomer($customer);
-            $orderCreateModel->getSession()->setCustomerId($customer->getId());
+
             $order = $orderCreateModel->createOrder();
             $orderItem = $this->getOrderItemForTransaction($order);
             $this->invoiceOrder($orderItem);
@@ -163,7 +165,6 @@ public function createOrder($orderData)
      */
     protected function processQuote($data = [])
     {
-        $this->currentSession = $this->sessionQuoteFactory->create();
         /** @var \Magento\Sales\Model\AdminOrder\Create $orderCreateModel */
         $orderCreateModel = $this->createOrderFactory->create(
             ['quoteSession' => $this->currentSession]
@@ -173,6 +174,7 @@ protected function processQuote($data = [])
         $orderCreateModel->setShippingAsBilling(1);
         $orderCreateModel->addProducts($data['add_products']);
         $orderCreateModel->getQuote()->getShippingAddress()->unsetData('cached_items_all');
+        $orderCreateModel->getQuote()->getShippingAddress()->setShippingMethod($data['order']['shipping_method']);
         $orderCreateModel->getQuote()->setTotalsCollectedFlag(false);
         $orderCreateModel->collectShippingRates();
         $orderCreateModel->getQuote()->getPayment()->addData($data['payment'])->setQuote($orderCreateModel->getQuote());
diff --git a/app/code/Magento/SalesSampleData/composer.json b/app/code/Magento/SalesSampleData/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~5.5.0|~5.6.0|~7.0.0",
         "magento/module-sales": "100.1.*",
-        "magento/module-sample-data": "100.1.*"
+        "magento/module-sample-data": "100.1.*",
+        "magento/module-configurable-sample-data": "100.1.*"
     },
     "type": "magento2-module",
     "version": "100.1.0-rc1",
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSampleData/Test/TestCase/LoginCustomerTest.xml b/dev/tests/functional/tests/app/Magento/CustomerSampleData/Test/TestCase/LoginCustomerTest.xml
@@ -12,7 +12,7 @@
             <data name="customer/data/firstname" xsi:type="string">Veronica</data>
             <data name="customer/data/lastname" xsi:type="string">Costello</data>
             <data name="customer/data/email" xsi:type="string">roni_cost@example.com</data>
-            <data name="customer/data/password" xsi:type="string">roni_cost@example.com</data>
+            <data name="customer/data/password" xsi:type="string">roni_cost3@example.com</data>
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/SalesSampleData/Test/TestCase/CheckoutSalesSampleDataProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesSampleData/Test/TestCase/CheckoutSalesSampleDataProductEntityTest.xml
@@ -12,16 +12,19 @@
             <data name="id" xsi:type="string">1</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
             <data name="prices" xsi:type="array">
-                <item name="grandTotal" xsi:type="string">50.00</item>
+                <item name="grandTotal" xsi:type="string">53.71</item>
             </data>
             <data name="status" xsi:type="string">Pending</data>
             <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Hold, Ship, Invoice, Edit</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
-            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="configData" xsi:type="string">checkmo</data>
+            <data name="customer/data/firstname" xsi:type="string">Veronica</data>
+            <data name="customer/data/lastname" xsi:type="string">Costello</data>
+            <data name="customer/data/email" xsi:type="string">roni_cost@example.com</data>
+            <data name="customer/data/password" xsi:type="string">roni_cost3@example.com</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend"/>
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/SalesSampleData/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/SalesSampleData/Test/etc/testcase.xml
@@ -7,14 +7,12 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/TestCase/etc/testcase.xsd">
     <scenario name="CheckoutSalesSampleDataProductEntityTest" firstStep="setupConfiguration">
-        <step name="setupConfiguration" module="Magento_Config" next="createCustomer"/>
-        <step name="createCustomer" module="Magento_Customer" next="createProducts"/>
+        <step name="setupConfiguration" module="Magento_Config" next="loginCustomerOnFrontend"/>
+        <step name="loginCustomerOnFrontend" module="Magento_Customer" next="createProducts"/>
         <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart"/>
         <step name="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTax"/>
         <step name="estimateShippingAndTax" module="Magento_Checkout" next="clickProceedToCheckout"/>
-        <step name="clickProceedToCheckout" module="Magento_Checkout" next="selectCheckoutMethod"/>
-        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress"/>
-        <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod"/>
+        <step name="clickProceedToCheckout" module="Magento_Checkout" next="fillShippingMethod"/>
         <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod"/>
         <step name="selectPaymentMethod" module="Magento_Checkout" next="placeOrder"/>
         <step name="placeOrder" module="Magento_Checkout"/>
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/sample-data.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/sample-data.xml
@@ -9,7 +9,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
     <rule scope="testsuite">
         <allow>
-            <module value="Magento_Install"/>
             <module value="Magento_CatalogSampleData"/>
             <module value="Magento_BundleSampleData"/>
             <module value="Magento_ConfigurableSampleData"/>
