Skip to content

Commit f1da0c7

Browse files
ysapigaysapiga
committed
MC-35968: Admin: Add items to shopping cart from different sources (advanced checkout)
1 parent ed89465 commit f1da0c7

18 files changed

+65
-40
lines changed

‎dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
use Magento\Customer\Model\Session;
1111
use Magento\Customer\Model\Visitor;
1212
use Magento\TestFramework\Helper\Bootstrap;
13+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
1314

14-
require __DIR__ . '/second_product_simple.php';
15-
require __DIR__ . '/../../Customer/_files/customer.php';
15+
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple.php');
16+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
1617

1718
$objectManager = Bootstrap::getObjectManager();
1819
/** @var Session $session */

‎dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer_rollback.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
require __DIR__ . '/../../Customer/_files/customer_rollback.php';
9-
require __DIR__ . '/second_product_simple_rollback.php';
8+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
9+
10+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
11+
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple_rollback.php');

‎dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
use Magento\Quote\Api\Data\CartInterface;
1616
use Magento\Quote\Api\Data\CartInterfaceFactory;
1717
use Magento\TestFramework\Helper\Bootstrap;
18+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
1819

19-
require __DIR__ . '/../../Customer/_files/customer.php';
20-
require __DIR__ . '/../../Customer/_files/customer_address.php';
21-
require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually.php';
20+
21+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
22+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_address.php');
23+
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/simple_products_not_visible_individually.php');
2224

2325
$objectManager = Bootstrap::getObjectManager();
2426
/** @var ProductRepositoryInterface $productRepository */

‎dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product_rollback.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Magento\Quote\Api\CartRepositoryInterface;
99
use Magento\TestFramework\Helper\Bootstrap;
1010
use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
11+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
1112

1213
$objectManager = Bootstrap::getObjectManager();
1314
/** @var CartRepositoryInterface $quoteRepository */
@@ -19,6 +20,7 @@
1920
$quoteRepository->delete($quote);
2021
}
2122

22-
require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php';
23-
require __DIR__ . '/../../Customer/_files/customer_address_rollback.php';
24-
require __DIR__ . '/../../Customer/_files/customer_rollback.php';
23+
Resolver::getInstance()
24+
->requireDataFixture('Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php');
25+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_address_rollback.php');
26+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');

‎dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
use Magento\Quote\Api\Data\CartInterface;
1616
use Magento\Quote\Api\Data\CartInterfaceFactory;
1717
use Magento\TestFramework\Helper\Bootstrap;
18+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
1819

19-
require __DIR__ . '/../../Customer/_files/customer.php';
20-
require __DIR__ . '/../../Customer/_files/customer_address.php';
21-
require __DIR__ . '/../../../Magento/Catalog/_files/taxable_simple_product.php';
20+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
21+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_address.php');
22+
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/taxable_simple_product.php');
2223

2324
$objectManager = Bootstrap::getObjectManager();
2425
/** @var ProductRepositoryInterface $productRepository */

‎dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer_rollback.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Magento\Quote\Api\CartRepositoryInterface;
99
use Magento\TestFramework\Helper\Bootstrap;
1010
use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
11+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
1112

1213
$objectManager = Bootstrap::getObjectManager();
1314
/** @var CartRepositoryInterface $quoteRepository */
@@ -19,6 +20,6 @@
1920
$quoteRepository->delete($quote);
2021
}
2122

22-
require __DIR__ . '/../../../Magento/Catalog/_files/taxable_simple_product_rollback.php';
23-
require __DIR__ . '/../../Customer/_files/customer_address_rollback.php';
24-
require __DIR__ . '/../../Customer/_files/customer_rollback.php';
23+
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/taxable_simple_product_rollback.php');
24+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_address_rollback.php');
25+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');

‎dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
use Magento\Framework\Event\Observer;
1313
use Magento\Reports\Observer\CatalogProductCompareAddProductObserver;
1414
use Magento\TestFramework\Helper\Bootstrap;
15+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
1516

16-
require __DIR__ . '/../../../Magento/Catalog/_files/out_of_stock_product_with_category.php';
17-
require __DIR__ . '/../../Customer/_files/customer.php';
17+
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/out_of_stock_product_with_category.php');
18+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
1819

1920
$objectManager = Bootstrap::getObjectManager();
2021
/** @var ProductRepositoryInterface $productRepository */

‎dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product_rollback.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
require __DIR__ . '/../../../Magento/Catalog/_files/out_of_stock_product_with_category.php';
9-
require __DIR__ . '/../../Customer/_files/customer_rollback.php';
8+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
9+
10+
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/out_of_stock_product_with_category.php');
11+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');

‎dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
use Magento\Framework\Event\Observer;
1212
use Magento\Reports\Observer\CatalogProductCompareAddProductObserver;
1313
use Magento\TestFramework\Helper\Bootstrap;
14+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
1415

15-
require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple.php';
16-
require __DIR__ . '/../../Customer/_files/customer.php';
16+
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple.php');
17+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
1718

1819
$objectManager = Bootstrap::getObjectManager();
1920
$session = $objectManager->get(Session::class);

‎dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_rollback.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple_rollback.php';
9-
require __DIR__ . '/../../Customer/_files/customer_rollback.php';
8+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
9+
10+
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple_rollback.php');
11+
Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');

0 commit comments

Comments
 (0)