Skip to content

Commit a7aae86

Browse files
MC-30880: Integration Test Extensibility
1 parent c79c099 commit a7aae86

32 files changed

+383
-87
lines changed

dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately_rollback.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66

77
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
88

9-
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_rollback.php');
9+
Resolver::getInstance()->requireDataFixture('Magento/Bundle/_files/product_rollback.php');
1010
Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');

dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_mixed_products_2.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\ConfigurableProduct\Helper\Product\Options\Factory;
1414
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
1515
use Magento\Eav\Api\Data\AttributeOptionInterface;
16+
use Magento\Eav\Model\Config;
1617
use Magento\TestFramework\Helper\Bootstrap;
1718
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
1819

@@ -22,7 +23,9 @@
2223
/** @var ProductRepositoryInterface $productRepository */
2324
$productRepository = Bootstrap::getObjectManager()
2425
->get(ProductRepositoryInterface::class);
25-
26+
/** @var Config $eavConfig */
27+
$eavConfig = Bootstrap::getObjectManager()->get(Config::class);
28+
$attribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable');
2629
/** @var $installer CategorySetup */
2730
$installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
2831

dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@
1515
use Magento\TestFramework\Helper\Bootstrap;
1616
use Magento\Eav\Api\AttributeRepositoryInterface;
1717
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
18+
use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
1819

1920
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/attribute_set_based_on_default_set.php');
2021
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/categories.php');
2122

2223
$objectManager = Bootstrap::getObjectManager();
24+
/** @var GetAttributeSetByName $getAttributeSetByName */
25+
$getAttributeSetByName = $objectManager->get(GetAttributeSetByName::class);
26+
$attributeSet = $getAttributeSetByName->execute('second_attribute_set');
2327
/** @var Config $eavConfig */
2428
$eavConfig = $objectManager->get(Config::class);
2529
/** @var AttributeRepositoryInterface $attributeRepository */

dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute_rollback.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Magento\Eav\Api\AttributeRepositoryInterface;
1616
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
1717

18-
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/empty_attribute_set_rollback.php');
18+
Resolver::getInstance()->requireDataFixture('Magento/Eav/_files/empty_attribute_set_rollback.php');
1919
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/categories_rollback.php');
2020
/** @var ObjectManager $objectManager */
2121
$objectManager = Bootstrap::getObjectManager();

dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_store.php');
1313

1414
$objectManager = Bootstrap::getObjectManager();
15-
/** @var CustomerRegistry $customerRegistry */
16-
$customerRegistry = Bootstrap::getObjectManager()->create(CustomerRegistry::class);
17-
$customer = $customerRegistry->retrieve(1);
1815
/** @var StoreRepositoryInterface $storeRepository */
1916
$storeRepository = $objectManager->get(StoreRepositoryInterface::class);
2017
$store = $storeRepository->get('fixture_second_store');

dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
\Magento\Store\Model\StoreManagerInterface::class
2222
)->getStore()->getWebsiteId()
2323
],
24-
'customer_group_ids' => [\Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID],
24+
'customer_group_ids' => [\Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID, 1],
2525
'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC,
2626
'coupon_code' => uniqid(),
2727
'simple_action' => \Magento\SalesRule\Model\Rule::BY_PERCENT_ACTION,

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_different_super_attribute.php

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@
1818
Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute.php');
1919
Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute_2.php');
2020

21+
$objectManager = Bootstrap::getObjectManager();
2122
/** @var ProductRepositoryInterface $productRepository */
22-
$productRepository = Bootstrap::getObjectManager()
23-
->get(ProductRepositoryInterface::class);
23+
$productRepository = $objectManager->get(ProductRepositoryInterface::class);
2424

2525
/** @var $installer CategorySetup */
26-
$installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
27-
26+
$installer = $objectManager->create(CategorySetup::class);
27+
/** @var \Magento\Eav\Model\Config $eavConfig */
28+
$eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
29+
$attribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable');
30+
$attribute2 = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable_2');
2831
/* Create simple products per each option value*/
2932
/** @var AttributeOptionInterface[] $options */
3033
$options = $attribute->getOptions();
@@ -37,7 +40,7 @@
3740

3841
foreach ($options as $option) {
3942
/** @var $product Product */
40-
$product = Bootstrap::getObjectManager()->create(Product::class);
43+
$product = $objectManager->create(Product::class);
4144
$productId = array_shift($productIds);
4245
$product->setTypeId(Type::TYPE_SIMPLE)
4346
->setId($productId)
@@ -61,9 +64,9 @@
6164
}
6265

6366
/** @var $product Product */
64-
$product = Bootstrap::getObjectManager()->create(Product::class);
67+
$product = $objectManager->create(Product::class);
6568
/** @var Factory $optionsFactory */
66-
$optionsFactory = Bootstrap::getObjectManager()->create(Factory::class);
69+
$optionsFactory = $objectManager->create(Factory::class);
6770
$configurableAttributesData = [
6871
[
6972
'attribute_id' => $attribute->getId(),
@@ -103,7 +106,7 @@
103106

104107
foreach ($options as $option) {
105108
/** @var $product Product */
106-
$product = Bootstrap::getObjectManager()->create(Product::class);
109+
$product = $objectManager->create(Product::class);
107110
$productId = array_shift($productIds);
108111
$product->setTypeId(Type::TYPE_SIMPLE)
109112
->setId($productId)
@@ -127,10 +130,10 @@
127130
}
128131

129132
/** @var $product Product */
130-
$product = Bootstrap::getObjectManager()->create(Product::class);
133+
$product = $objectManager->create(Product::class);
131134

132135
/** @var Factory $optionsFactory */
133-
$optionsFactory = Bootstrap::getObjectManager()->create(Factory::class);
136+
$optionsFactory = $objectManager->create(Factory::class);
134137

135138
$configurableAttributesData = [
136139
[

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_different_super_attribute_rollback.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
7+
use Magento\Framework\Registry;
8+
use Magento\TestFramework\Helper\Bootstrap;
79

810
Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_products_rollback.php');
911

12+
$objectManager = Bootstrap::getObjectManager();
13+
/** @var Registry $registry */
14+
$registry = $objectManager->get(Registry::class);
1015
$registry->unregister('isSecureArea');
1116
$registry->register('isSecureArea', true);
1217

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\ConfigurableProduct\Helper\Product\Options\Factory;
1414
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
1515
use Magento\Eav\Api\Data\AttributeOptionInterface;
16+
use Magento\Eav\Model\Config;
1617
use Magento\TestFramework\Helper\Bootstrap;
1718
use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionFactory;
1819
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
@@ -28,7 +29,9 @@
2829

2930
/** @var $installer CategorySetup */
3031
$installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
31-
32+
/** @var Config $eavConfig */
33+
$eavConfig = Bootstrap::getObjectManager()->get(Config::class);
34+
$attribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable');
3235
/* Create simple products per each option value*/
3336
/** @var AttributeOptionInterface[] $options */
3437
$options = $attribute->getOptions();

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php

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

8+
use Magento\Catalog\Model\Product;
9+
use Magento\Eav\Api\AttributeRepositoryInterface;
10+
use Magento\Eav\Model\Config;
811
use Magento\Eav\Model\Entity\Attribute\FrontendLabel;
912
use Magento\TestFramework\Helper\Bootstrap;
1013
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
1114

1215
Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_products.php');
1316

17+
$objectManager = Bootstrap::getObjectManager();
18+
/** @var AttributeRepositoryInterface $attributeRepository */
19+
$attributeRepository = $objectManager->create(AttributeRepositoryInterface::class);
1420
// Add frontend label to created attribute:
15-
$frontendLabelAttribute = Bootstrap::getObjectManager()->get(FrontendLabel::class);
21+
$frontendLabelAttribute = $objectManager->get(FrontendLabel::class);
1622
$frontendLabelAttribute->setStoreId(1);
1723
$frontendLabelAttribute->setLabel('Default Store View label');
18-
24+
/** @var Config $eavConfig */
25+
$eavConfig = $objectManager->get(Config::class);
26+
$attribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable');
1927
$frontendLabels = $attribute->getFrontendLabels();
2028
$frontendLabels[] = $frontendLabelAttribute;
2129

0 commit comments

Comments
 (0)