Merge remote-tracking branch 'origin/AC-14487-V2' into spartans_pr_28042025

Author: glo60612

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php

@@ -1,21 +1,35 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\GraphQl\Sales\CustomerOrders;
 
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\Checkout\Test\Fixture\PlaceOrder as PlaceOrderFixture;
+use Magento\Checkout\Test\Fixture\SetBillingAddress;
+use Magento\Checkout\Test\Fixture\SetDeliveryMethod as SetDeliveryMethodFixture;
+use Magento\Checkout\Test\Fixture\SetPaymentMethod as SetPaymentMethodFixture;
+use Magento\Checkout\Test\Fixture\SetShippingAddress;
+use Magento\Customer\Test\Fixture\Customer;
 use Magento\Framework\DB\Transaction;
 use Magento\Framework\Registry;
 use Magento\GraphQl\GetCustomerAuthenticationHeader;
+use Magento\Store\Test\Fixture\Store;
 use Magento\GraphQl\Sales\Fixtures\CustomerPlaceOrder;
+use Magento\Quote\Test\Fixture\AddProductToCart;
+use Magento\Quote\Test\Fixture\CustomerCart;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Shipment;
 use Magento\Sales\Model\Order\ShipmentFactory;
 use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
+use Magento\Sales\Test\Fixture\Invoice as InvoiceFixture;
+use Magento\Sales\Test\Fixture\Shipment as ShipmentFixture;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -96,25 +110,57 @@ public function testGetOrderShipment()
         $this->assertNotEmpty($shipment['comments'][0]['timestamp']);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/GraphQl/Sales/_files/customer_order_with_multiple_shipments.php
-     */
+    #[
+        DataFixture(Store::class),
+        DataFixture(ProductFixture::class, as: 'product1'),
+        DataFixture(ProductFixture::class, as: 'product2'),
+        DataFixture(Customer::class, as: 'customer'),
+        DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], as: 'quote'),
+        DataFixture(AddProductToCart::class, ['cart_id' => '$quote.id$', 'product_id' => '$product1.id$', 'qty' => 2]),
+        DataFixture(AddProductToCart::class, ['cart_id' => '$quote.id$', 'product_id' => '$product2.id$', 'qty' => 2]),
+        DataFixture(SetBillingAddress::class, ['cart_id' => '$quote.id$']),
+        DataFixture(SetShippingAddress::class, ['cart_id' => '$quote.id$']),
+        DataFixture(SetDeliveryMethodFixture::class, ['cart_id' => '$quote.id$']),
+        DataFixture(SetPaymentMethodFixture::class, ['cart_id' => '$quote.id$']),
+        DataFixture(PlaceOrderFixture::class, ['cart_id' => '$quote.id$'], 'order'),
+        DataFixture(InvoiceFixture::class, ['order_id' => '$order.id$'], 'invoice'),
+        DataFixture(
+            ShipmentFixture::class,
+            [
+                'order_id' => '$order.id$',
+                'items' => [['product_id' => '$product1.id$', 'qty' => 1]]
+            ],
+            'shipment1'
+        ),
+        DataFixture(
+            ShipmentFixture::class,
+            [
+                'order_id' => '$order.id$',
+                'items' => [['product_id' => '$product2.id$', 'qty' => 1]]
+            ],
+            'shipment2'
+        ),
+
+    ]
     public function testGetOrderShipmentsMultiple()
     {
-        $query = $this->getQuery('100000555');
-        $authHeader = $this->getCustomerAuthHeader->execute('customer_uk_address@test.com', 'password');
-
+        $order = DataFixtureStorageManager::getStorage()->get('order');
+        $customer = DataFixtureStorageManager::getStorage()->get('customer');
+        $shipment1 = DataFixtureStorageManager::getStorage()->get('shipment1');
+        $shipment2 = DataFixtureStorageManager::getStorage()->get('shipment2');
+        $query = $this->getQuery($order->getIncrementId());
+        $authHeader = $this->getCustomerAuthHeader->execute($customer->getEmail(), 'password');
         $result = $this->graphQlQuery($query, [], '', $authHeader);
         $this->assertArrayNotHasKey('errors', $result);
         $order = $result['customer']['orders']['items'][0];
         $shipments = $order['shipments'];
         $this->assertCount(2, $shipments);
-        $this->assertEquals('0000000098', $shipments[0]['number']);
+        $this->assertEquals($shipment1->getIncrementId(), $shipments[0]['number']);
         $this->assertCount(1, $shipments[0]['items']);
-        $this->assertEquals('0000000099', $shipments[1]['number']);
+        $this->assertEquals($shipment2->getIncrementId(), $shipments[1]['number']);
         $this->assertCount(1, $shipments[1]['items']);
     }
-
+    
     /**
      * @magentoConfigFixture default_store carriers/ups/active 1
      * @magentoApiDataFixture Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php

dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 // @codingStandardsIgnoreStart
@@ -351,6 +351,7 @@ public function testConstructor(
                 \Magento\Framework\Session\Config::class,
                 ['deploymentConfig' => $deploymentConfigMock]
             );
+            $expectedSavePath = $model->getOption('save_path') ? $expectedSavePath : null;
             $this->assertEquals($expectedSavePath, $model->getOption('save_path'));
             $this->assertEquals($expectedSaveHandler, $model->getOption('session.save_handler'));
             global $mockPHPFunctions;