MC-38620: Merge release branch into 2.4-develop

zakdma · zakdma · commit 162b49ea1cde · 2020-10-26T18:17:52.000+02:00
fix tests after merge
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Helper/ReorderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Helper/ReorderTest.php
@@ -68,13 +68,14 @@ public function testCanReorderForGuest(): void
     }
 
     /**
-     * @magentoDataFixture Magento/Sales/_files/customer_order_with_two_items.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Sales/_files/order.php
      *
      * @return void
      */
     public function testCanReorderForLoggedCustomer(): void
     {
-        $order = $this->orderFactory->create()->loadByIncrementId('100000555');
+        $order = $this->orderFactory->create()->loadByIncrementId('100000001');
         $this->customerSession->setCustomerId($order->getCustomerId());
         $this->assertTrue($this->helper->canReorder($order->getId()));
     }

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,14 @@ public function testCanReorderForGuest(): void`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/**`
`71`		`- * @magentoDataFixture Magento/Sales/_files/customer_order_with_two_items.php`
	`71`	`+ * @magentoDataFixture Magento/Customer/_files/customer.php`
	`72`	`+ * @magentoDataFixture Magento/Sales/_files/order.php`
`72`	`73`	`*`
`73`	`74`	`* @return void`
`74`	`75`	`*/`
`75`	`76`	`public function testCanReorderForLoggedCustomer(): void`
`76`	`77`	`{`
`77`		`- $order = $this->orderFactory->create()->loadByIncrementId('100000555');`
	`78`	`+ $order = $this->orderFactory->create()->loadByIncrementId('100000001');`
`78`	`79`	`$this->customerSession->setCustomerId($order->getCustomerId());`
`79`	`80`	`$this->assertTrue($this->helper->canReorder($order->getId()));`
`80`	`81`	`}`