merge magento/2.3-develop into magento-pangolin/community-tests-migration-pr

Author: magento-mts-svc

app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php

@@ -89,11 +89,6 @@ public function execute()
                 ['fileId' => 'image']
             );
             $uploader->setAllowedExtensions($this->getAllowedExtensions());
-
-            if (!$uploader->checkMimeType($this->getAllowedMimeTypes())) {
-                throw new LocalizedException(__('Disallowed File Type.'));
-            }
-
             $imageAdapter = $this->adapterFactory->create();
             $uploader->addValidateCallback('catalog_product_image', $imageAdapter, 'validateUploadFile');
             $uploader->setAllowRenameFiles(true);
@@ -133,14 +128,4 @@ private function getAllowedExtensions()
     {
         return array_keys($this->allowedMimeTypes);
     }
-
-    /**
-     * Get the set of allowed mime types.
-     *
-     * @return array
-     */
-    private function getAllowedMimeTypes()
-    {
-        return array_values($this->allowedMimeTypes);
-    }
 }

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickOnAdvancedInventoryLinkActionGroup.xml

@@ -18,4 +18,15 @@
         <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
         <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
     </actionGroup>
+
+    <!-- ActionGroup click on Advanced Inventory Button in product form;
+         You must already be on the product form page -->
+    <actionGroup name="AdminClickOnAdvancedInventoryButtonActionGroup">
+        <annotations>
+            <description>Clicks on the 'Advanced Inventory' link on the Admin Product creation/edit page.</description>
+        </annotations>
+
+        <click selector="{{AdminProductFormSection.advancedInventoryButton}}" stepKey="clickOnAdvancedInventoryLink"/>
+        <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
+    </actionGroup>
 </actionGroups>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

@@ -38,7 +38,7 @@
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']" timeout="30"/>
         <element name="unselectCategories" type="button" selector="//span[@class='admin__action-multiselect-crumb']/span[contains(.,'{{category}}')]/../button[@data-action='remove-selected-item']" parameterized="true" timeout="30"/>
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
-        <element name="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]" timeout="30"/>
+        <element name="advancedInventoryLink" type="button" selector="button[data-index='advanced_inventory_button'].action-additional" timeout="30"/>
         <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']" timeout="30"/>
         <element name="productStockStatusDisabled" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]'][disabled=true]"/>
         <element name="stockStatus" type="select" selector="[data-index='product-details'] select[name='product[quantity_and_stock_status][is_in_stock]']"/>

app/code/Magento/CatalogInventory/Test/Mftf/Section/AdminProductFormSection.xml

@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductFormSection">
-        <element name="advancedInventoryLink" type="button" selector="button[data-index='advanced_inventory_button']" timeout="30"/>
+        <element name="advancedInventoryLink" type="button" selector="button[data-index='advanced_inventory_button'].action-additional" timeout="30"/>
+        <element name="advancedInventoryButton" type="button" selector="button[data-index='advanced_inventory_button'].action-basic" timeout="30"/>
     </section>
 </sections>

app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php

@@ -56,7 +56,7 @@ public function getData(string $blockIdentifier): array
             );
         }
 
-        $renderedContent = $this->widgetFilter->filter($block->getContent());
+        $renderedContent = $this->widgetFilter->filterDirective($block->getContent());
 
         $blockData = [
             BlockInterface::BLOCK_ID => $block->getId(),

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCreateNewOrderSection.xml

@@ -12,7 +12,7 @@
         <element name="updateChangesBtn" type="button" selector=".order-sidebar .actions .action-default.scalable" timeout="30"/>
         <element name="productName" type="text" selector="#order-items_grid  span[id*=order_item]"/>
         <element name="productPrice" type="text" selector=".even td[class=col-price] span[class=price]"/>
-        <element name="productQty" type="input" selector="td[class=col-qty] input"/>
+        <element name="productQty" type="input" selector="td[class=col-qty] .input-text.item-qty.admin__control-text"/>
         <element name="gridCell" type="text" selector="//div[contains(@id, 'order-items_grid')]//tbody[{{row}}]//td[count(//table[contains(@class, 'order-tables')]//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true" timeout="30"/>
     </section>
 </sections>

app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php

@@ -105,6 +105,7 @@ public function execute(AddressInterface $address): array
             foreach ($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES] as $attribute) {
                 $isArray = false;
                 if (is_array($attribute['value'])) {
+                    // @ignoreCoverageStart
                     $isArray = true;
                     foreach ($attribute['value'] as $attributeValue) {
                         if (is_array($attributeValue)) {
@@ -116,6 +117,7 @@ public function execute(AddressInterface $address): array
                         $customAttributes[$attribute['attribute_code']] = implode(',', $attribute['value']);
                         continue;
                     }
+                    // @ignoreCoverageEnd
                 }
                 if ($isArray) {
                     continue;

app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php

@@ -39,17 +39,17 @@ public function __construct(
      *
      * @param CartInterface $cart
      * @param AddressInterface $billingAddress
-     * @param bool $useForShipping
+     * @param bool $sameAsShipping
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(
         CartInterface $cart,
         AddressInterface $billingAddress,
-        bool $useForShipping
+        bool $sameAsShipping
     ): void {
         try {
-            $this->billingAddressManagement->assign($cart->getId(), $billingAddress, $useForShipping);
+            $this->billingAddressManagement->assign($cart->getId(), $billingAddress, $sameAsShipping);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
         } catch (InputException $e) {

app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php

@@ -61,21 +61,25 @@ public function execute(QuoteAddress $address): array
             return $addressData;
         }
 
-        $addressItemsData = [];
         foreach ($address->getAllItems() as $addressItem) {
             if ($addressItem instanceof \Magento\Quote\Model\Quote\Item) {
                 $itemId = $addressItem->getItemId();
             } else {
                 $itemId = $addressItem->getQuoteItemId();
             }
-
-            $addressItemsData[] = [
+            $productData = $addressItem->getProduct()->getData();
+            $productData['model'] = $addressItem->getProduct();
+            $addressData['cart_items'][] = [
                 'cart_item_id' => $itemId,
                 'quantity' => $addressItem->getQty()
             ];
+            $addressData['cart_items_v2'][] = [
+                'id' => $itemId,
+                'quantity' => $addressItem->getQty(),
+                'product' => $productData,
+                'model' => $addressItem,
+            ];
         }
-        $addressData['cart_items'] = $addressItemsData;
-
         return $addressData;
     }
 }

app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php

@@ -65,8 +65,11 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
     {
         $customerAddressId = $billingAddressInput['customer_address_id'] ?? null;
         $addressInput = $billingAddressInput['address'] ?? null;
-        $useForShipping = isset($billingAddressInput['use_for_shipping'])
+        // Need to keep this for BC of `use_for_shipping` field
+        $sameAsShipping = isset($billingAddressInput['use_for_shipping'])
             ? (bool)$billingAddressInput['use_for_shipping'] : false;
+        $sameAsShipping = isset($billingAddressInput['same_as_shipping'])
+            ? (bool)$billingAddressInput['same_as_shipping'] : $sameAsShipping;
 
         if (null === $customerAddressId && null === $addressInput) {
             throw new GraphQlInputException(
@@ -81,15 +84,15 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
         }
 
         $addresses = $cart->getAllShippingAddresses();
-        if ($useForShipping && count($addresses) > 1) {
+        if ($sameAsShipping && count($addresses) > 1) {
             throw new GraphQlInputException(
-                __('Using the "use_for_shipping" option with multishipping is not possible.')
+                __('Using the "same_as_shipping" option with multishipping is not possible.')
             );
         }
 
         $billingAddress = $this->createBillingAddress($context, $customerAddressId, $addressInput);
 
-        $this->assignBillingAddressToCart->execute($cart, $billingAddress, $useForShipping);
+        $this->assignBillingAddressToCart->execute($cart, $billingAddress, $sameAsShipping);
     }
 
     /**