diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiConfigFixture.php b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiConfigFixture.php
new file mode 100644
index 000000000000..22e63dbb66d8
--- /dev/null
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiConfigFixture.php
@@ -0,0 +1,159 @@
+getAnnotations();
+ if (!isset($annotations['method'][$this->annotation])) {
+ return;
+ }
+ foreach ($annotations['method'][$this->annotation] as $configPathAndValue) {
+ if (preg_match('/^.+?(?=_store\s)/', $configPathAndValue, $matches)) {
+ /* Store-scoped config value */
+ $storeCode = $matches[0] != 'current' ? $matches[0] : null;
+ $parts = preg_split('/\s+/', $configPathAndValue, 3);
+ list($configScope, $configPath, $requiredValue) = $parts + ['', '', ''];
+ $originalValue = $this->_getConfigValue($configPath, $storeCode);
+ $this->_storeConfigValues[$storeCode][$configPath] = $originalValue;
+ if ($this->checkIfValueExist($configPath, $storeCode)) {
+ $this->_valuesToDeleteFromDatabase[$storeCode][$configPath] = $requiredValue;
+ }
+ $this->_setConfigValue($configPath, $requiredValue, $storeCode);
+ } else {
+ /* Global config value */
+ list($configPath, $requiredValue) = preg_split('/\s+/', $configPathAndValue, 2);
+
+ $originalValue = $this->_getConfigValue($configPath);
+ $this->_globalConfigValues[$configPath] = $originalValue;
+ if ($this->checkIfValueExist($configPath)) {
+ $this->_valuesToDeleteFromDatabase['global'][$configPath] = $requiredValue;
+ }
+
+ $this->_setConfigValue($configPath, $requiredValue);
+ }
+ }
+ }
+
+ /**
+ * Restore original values for changed config options
+ */
+ protected function _restoreConfigData()
+ {
+ $configResource = Bootstrap::getObjectManager()->get(ConfigResource::class);
+
+ /* Restore global values */
+ foreach ($this->_globalConfigValues as $configPath => $originalValue) {
+ if (isset($this->_valuesToDeleteFromDatabase['global'][$configPath])) {
+ $configResource->deleteConfig($configPath);
+ } else {
+ $this->_setConfigValue($configPath, $originalValue);
+ }
+ }
+ $this->_globalConfigValues = [];
+
+ /* Restore store-scoped values */
+ foreach ($this->_storeConfigValues as $storeCode => $originalData) {
+ foreach ($originalData as $configPath => $originalValue) {
+ if (empty($storeCode)) {
+ $storeCode = null;
+ }
+ if (isset($this->_valuesToDeleteFromDatabase[$storeCode][$configPath])) {
+ $scopeId = $this->getStoreIdByCode($storeCode);
+ $configResource->deleteConfig($configPath, 'stores', $scopeId);
+ } else {
+ $this->_setConfigValue($configPath, $originalValue, $storeCode);
+ }
+ }
+ }
+ $this->_storeConfigValues = [];
+ }
+
+ /**
+ * Load configs by path and scope
+ *
+ * @param string $configPath
+ * @param string $storeCode
+ * @return Config[]
+ */
+ private function loadConfigs(string $configPath, string $storeCode = null): array
+ {
+ $configCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
+ $collection = $configCollectionFactory->create();
+ $scope = $storeCode ? 'stores' : 'default';
+ $scopeId = $storeCode ? $this->getStoreIdByCode($storeCode) : 0;
+
+ $collection->addScopeFilter($scope, $scopeId, $configPath);
+ return $collection->getItems();
+ }
+
+ /**
+ * Check if config exist in the database
+ *
+ * @param string $configPath
+ * @param string|null $storeCode
+ */
+ private function checkIfValueExist(string $configPath, string $storeCode = null): bool
+ {
+ $configs = $this->loadConfigs($configPath, $storeCode);
+
+ return !(bool)$configs;
+ }
+
+ /**
+ * Returns the store ID by the store code
+ *
+ * @param string $storeCode
+ * @return int
+ */
+ private function getStoreIdByCode(string $storeCode): int
+ {
+ $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
+ $store = $storeManager->getStore($storeCode);
+ return (int)$store->getId();
+ }
+}
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/App/MutableScopeConfig.php b/dev/tests/api-functional/framework/Magento/TestFramework/App/MutableScopeConfig.php
new file mode 100644
index 000000000000..efcb5be34e59
--- /dev/null
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/App/MutableScopeConfig.php
@@ -0,0 +1,125 @@
+getTestAppConfig()->isSetFlag($path, $scopeType, $scopeCode);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getValue($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
+ {
+ return $this->getTestAppConfig()->getValue($path, $scopeType, $scopeCode);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function setValue(
+ $path,
+ $value,
+ $scopeType = \Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+ $scopeCode = null
+ ) {
+ $this->persistConfig($path, $value, $scopeType, $scopeCode);
+ return $this->getTestAppConfig()->setValue($path, $value, $scopeType, $scopeCode);
+ }
+
+ /**
+ * Clean app config cache
+ *
+ * @param string|null $type
+ * @return void
+ */
+ public function clean()
+ {
+ $this->getTestAppConfig()->clean();
+ }
+
+ /**
+ * Retrieve test app config instance
+ *
+ * @return \Magento\TestFramework\App\Config
+ */
+ private function getTestAppConfig()
+ {
+ if (!$this->testAppConfig) {
+ $this->testAppConfig = ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+ }
+
+ return $this->testAppConfig;
+ }
+
+ /**
+ * Persist config in database
+ *
+ * @param string $path
+ * @param string $value
+ * @param string $scopeType
+ * @param string|null $scopeCode
+ */
+ private function persistConfig($path, $value, $scopeType, $scopeCode): void
+ {
+ $pathParts = explode('/', $path);
+ $store = '';
+ if ($scopeType === \Magento\Store\Model\ScopeInterface::SCOPE_STORE) {
+ if ($scopeCode !== null) {
+ $store = ObjectManager::getInstance()
+ ->get(\Magento\Store\Api\StoreRepositoryInterface::class)
+ ->get($scopeCode)
+ ->getId();
+ } else {
+ $store = ObjectManager::getInstance()
+ ->get(\Magento\Store\Model\StoreManagerInterface::class)
+ ->getStore()
+ ->getId();
+ }
+ }
+ $configData = [
+ 'section' => $pathParts[0],
+ 'website' => '',
+ 'store' => $store,
+ 'groups' => [
+ $pathParts[1] => [
+ 'fields' => [
+ $pathParts[2] => [
+ 'value' => $value
+ ]
+ ]
+ ]
+ ]
+ ];
+ ObjectManager::getInstance()
+ ->get(\Magento\Config\Model\Config\Factory::class)
+ ->create(['data' => $configData])
+ ->save();
+ }
+}
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php b/dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php
index 514d8e5344d5..a3a013ae812a 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php
@@ -7,10 +7,19 @@
*/
namespace Magento\TestFramework\Bootstrap;
+use Magento\TestFramework\Annotation\ApiConfigFixture;
+use Magento\TestFramework\Annotation\ConfigFixture;
+
+/**
+ * @inheritdoc
+ */
class WebapiDocBlock extends \Magento\TestFramework\Bootstrap\DocBlock
{
/**
- * Get list of subscribers. In addition, register magentoApiDataFixture annotation processing.
+ * Get list of subscribers.
+ *
+ * In addition, register magentoApiDataFixture and magentoConfigFixture
+ * annotation processors
*
* @param \Magento\TestFramework\Application $application
* @return array
@@ -18,7 +27,14 @@ class WebapiDocBlock extends \Magento\TestFramework\Bootstrap\DocBlock
protected function _getSubscribers(\Magento\TestFramework\Application $application)
{
$subscribers = parent::_getSubscribers($application);
+ foreach ($subscribers as $key => $subscriber) {
+ if (get_class($subscriber) == ConfigFixture::class) {
+ unset($subscribers[$key]);
+ }
+ }
$subscribers[] = new \Magento\TestFramework\Annotation\ApiDataFixture($this->_fixturesBaseDir);
+ $subscribers[] = new ApiConfigFixture();
+
return $subscribers;
}
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php
index 2672431dbb56..21e608da4800 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php
@@ -14,13 +14,17 @@
*/
class StoreConfigTest extends GraphQlAbstract
{
- protected function setUp()
- {
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
- }
-
/**
* @magentoApiDataFixture Magento/Store/_files/store.php
+ * @magentoConfigFixture default_store catalog/seo/product_url_suffix test_product_suffix
+ * @magentoConfigFixture default_store catalog/seo/category_url_suffix test_category_suffix
+ * @magentoConfigFixture default_store catalog/seo/title_separator ___
+ * @magentoConfigFixture default_store catalog/frontend/list_mode 2
+ * @magentoConfigFixture default_store catalog/frontend/grid_per_page_values 16
+ * @magentoConfigFixture default_store catalog/frontend/list_per_page_values 8
+ * @magentoConfigFixture default_store catalog/frontend/grid_per_page 16
+ * @magentoConfigFixture default_store catalog/frontend/list_per_page 8
+ * @magentoConfigFixture default_store catalog/frontend/default_sort_by asc
*/
public function testGetStoreConfig()
{
@@ -43,6 +47,14 @@ public function testGetStoreConfig()
$response = $this->graphQlQuery($query);
$this->assertArrayHasKey('storeConfig', $response);
- //TODO: provide assertions after unmarking test as incomplete
+ $this->assertEquals('test_product_suffix', $response['storeConfig']['product_url_suffix']);
+ $this->assertEquals('test_category_suffix', $response['storeConfig']['category_url_suffix']);
+ $this->assertEquals('___', $response['storeConfig']['title_separator']);
+ $this->assertEquals('2', $response['storeConfig']['list_mode']);
+ $this->assertEquals('16', $response['storeConfig']['grid_per_page_values']);
+ $this->assertEquals(16, $response['storeConfig']['grid_per_page']);
+ $this->assertEquals('8', $response['storeConfig']['list_per_page_values']);
+ $this->assertEquals(8, $response['storeConfig']['list_per_page']);
+ $this->assertEquals('asc', $response['storeConfig']['catalog_default_sort_by']);
}
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
index 6ed0f6ef7a13..f71ec9ad8521 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -49,14 +49,12 @@ public function testAddProductIfQuantityIsNotAvailable()
/**
* @magentoApiDataFixture Magento/Catalog/_files/products.php
* @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
- * @magentoConfigFixture default cataloginventory/item_options/max_sale_qty 5
+ * @magentoConfigFixture default_store cataloginventory/item_options/max_sale_qty 5
* @expectedException \Exception
* @expectedExceptionMessage The most you may purchase is 5.
*/
public function testAddMoreProductsThatAllowed()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
-
$sku = 'custom-design-simple-product';
$quantity = 7;
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php
index 3969c758f12d..2e4851767b06 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php
@@ -9,6 +9,9 @@
use Magento\TestFramework\TestCase\GraphQlAbstract;
+/**
+ * Test for the product only x left in stock
+ */
class ProductOnlyXLeftInStockTest extends GraphQlAbstract
{
/**
@@ -42,7 +45,6 @@ public function testQueryProductOnlyXLeftInStockDisabled()
*/
public function testQueryProductOnlyXLeftInStockEnabled()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
$productSku = 'simple';
$query = <<markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
$productSku = 'simple';
$query = <<objectManager = Bootstrap::getObjectManager();
-
- // TODO: remove usage of the Config, use ConfigFixture instead https://github.com/magento/graphql-ce/issues/167
- $this->config = $this->objectManager->get(Config::class);
- $this->saveAgreementConfig(1);
- }
-
/**
* @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
* @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
+ * @magentoConfigFixture default_store checkout/options/enable_agreements 1
*/
public function testGetActiveAgreement()
{
@@ -76,6 +46,7 @@ public function testGetActiveAgreement()
* @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
* @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
* @magentoApiDataFixture Magento/Store/_files/second_store.php
+ * @magentoConfigFixture fixture_second_store_store checkout/options/enable_agreements 1
*/
public function testGetActiveAgreementOnSecondStore()
{
@@ -103,6 +74,7 @@ public function testGetActiveAgreementOnSecondStore()
* @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
* @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
* @magentoApiDataFixture Magento/Store/_files/second_store.php
+ * @magentoConfigFixture fixture_second_store_store checkout/options/enable_agreements 1
*/
public function testGetActiveAgreementFromSecondStoreOnDefaultStore()
{
@@ -133,11 +105,11 @@ public function testGetAgreementNotSet()
/**
* @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
* @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
+ * @magentoConfigFixture default_store checkout/options/enable_agreements 0
*/
public function testDisabledAgreements()
{
$query = $this->getQuery();
- $this->saveAgreementConfig(0);
$response = $this->graphQlQuery($query);
@@ -174,11 +146,11 @@ private function getQuery(): string
*/
private function assignAgreementsToStore(string $storeCode, string $agreementsName): void
{
- $agreementsFactory = $this->objectManager->get(AgreementFactory::class);
+ $agreementsFactory = ObjectManager::getInstance()->get(AgreementFactory::class);
/** @var Agreement $agreementsResource */
- $agreementsResource = $this->objectManager->get(Agreement::class);
+ $agreementsResource = ObjectManager::getInstance()->get(Agreement::class);
/** @var StoreManagerInterface $storeManager */
- $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+ $storeManager = ObjectManager::getInstance()->get(StoreManagerInterface::class);
$store = $storeManager->getStore($storeCode);
/** @var AgreementModel $agreements */
$agreements = $agreementsFactory->create();
@@ -186,50 +158,4 @@ private function assignAgreementsToStore(string $storeCode, string $agreementsNa
$agreements->setData('stores', [$store->getId()]);
$agreementsResource->save($agreements);
}
-
- protected function tearDown()
- {
- parent::tearDown();
-
- $this->deleteAgreementConfig();
- }
-
- /**
- * @param int $value
- * @param StoreInterface $store
- */
- private function saveAgreementConfig(int $value): void
- {
- $this->config->saveConfig(
- $this->agreementsXmlConfigPath,
- $value,
- ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
- 0
- );
-
- $this->reinitConfig();
- }
-
- /**
- * Delete config
- *
- * @return void
- */
- private function deleteAgreementConfig(): void
- {
- $this->config->deleteConfig(
- $this->agreementsXmlConfigPath,
- ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
- 0
- );
-
- $this->reinitConfig();
- }
-
- private function reinitConfig(): void
- {
- /** @var ReinitableConfigInterface $config */
- $config = $this->objectManager->get(ReinitableConfigInterface::class);
- $config->reinit();
- }
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductStockStatusTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductStockStatusTest.php
index 2826d61022c7..f37de6e8bb91 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductStockStatusTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductStockStatusTest.php
@@ -35,7 +35,6 @@ protected function setUp()
*/
public function testConfigurableProductShowOutOfStock()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
$parentSku = 'configurable';
$childSkuOutOfStock = 'simple_1010';
$stockItem = $this->stockRegistry->getStockItemBySku($childSkuOutOfStock);
@@ -55,7 +54,6 @@ public function testConfigurableProductShowOutOfStock()
*/
public function testConfigurableProductDoNotShowOutOfStock()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
$parentSku = 'configurable';
$childSkuOutOfStock = 'simple_1010';
$stockItem = $this->stockRegistry->getStockItemBySku($childSkuOutOfStock);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index 673d49630266..9baa3543b6a3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -101,7 +101,9 @@ public function testGetAvailablePaymentMethodsFromAnotherCustomerCart()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
+ * @magentoConfigFixture default_store payment/paypal_billing_agreement/active 0
+ * @magentoConfigFixture default_store payment/checkmo/active 0
+ * @magentoConfigFixture default_store payment/free/active 0
*/
public function testGetAvailablePaymentMethodsIfPaymentsAreNotPresent()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
index b01921ae67ed..02c22a0e902b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
@@ -134,7 +134,9 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 0
+ * @magentoConfigFixture default_store carriers/tablerate/active 0
+ * @magentoConfigFixture default_store carriers/freeshipping/active 0
*/
public function testGetAvailableShippingMethodsIfShippingMethodsAreNotPresent()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php
index 4432a233e96e..74a311932991 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php
@@ -30,7 +30,11 @@ class GetSelectedPaymentMethodTest extends GraphQlAbstract
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -52,7 +56,11 @@ public function testGetSelectedPaymentMethod()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -91,7 +99,11 @@ public function testGetSelectedPaymentMethodFromNonExistentCart()
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
index 591bac1c35ba..cb471d8f0f93 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
@@ -62,8 +62,14 @@ protected function setUp()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -174,7 +180,9 @@ public function testPlaceOrderWithNoShippingMethod()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -195,7 +203,9 @@ public function testPlaceOrderWithNoBillingAddress()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -215,7 +225,9 @@ public function testPlaceOrderWithNoPaymentMethod()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -237,8 +249,14 @@ public function testPlaceOrderWithOutOfStockProduct()
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -260,8 +278,14 @@ public function testPlaceOrderOfGuestCart()
* _security
* @magentoApiDataFixture Magento/Customer/_files/three_customers.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflinePaymentMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflinePaymentMethodsOnCartTest.php
index 0fe7aec2d634..138d27ef2648 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflinePaymentMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflinePaymentMethodsOnCartTest.php
@@ -47,7 +47,11 @@ protected function setUp()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*
* @param string $methodCode
* @param string $methodTitle
@@ -90,7 +94,11 @@ public function offlinePaymentMethodDataProvider(): array
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*/
public function testSetPurchaseOrderPaymentMethod()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
index c6c4a18bce4a..dcb5539fb3d4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
@@ -43,8 +43,10 @@ protected function setUp()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
* @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
*
* @param string $carrierCode
* @param string $methodCode
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index 7a1cd9edf78d..efda719ca153 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -251,7 +251,11 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
index bff66ece59b9..6b9e46fd153e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
@@ -45,7 +45,11 @@ protected function setUp()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*/
public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
{
@@ -89,7 +93,11 @@ public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*
* @expectedException Exception
* @expectedExceptionMessage Purchase order number is a required field.
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 9ddedbfc4654..8197db7e7fef 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -97,7 +97,9 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -249,7 +251,9 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
index 1501a9420236..16f291be9107 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
@@ -60,7 +60,6 @@ protected function setUp()
}
/**
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
* @magentoConfigFixture default_store checkout/options/guest_checkout 0
*/
public function testCreateEmptyCartIfGuestCheckoutIsDisabled()
@@ -84,7 +83,6 @@ public function testCreateEmptyCartIfGuestCheckoutIsDisabled()
/**
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
* @magentoConfigFixture default_store checkout/options/guest_checkout 0
*
* @expectedException \Exception
@@ -129,7 +127,6 @@ public function testSetBillingAddressToGuestCustomerCart()
/**
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
* @magentoConfigFixture default_store checkout/options/guest_checkout 0
*
* @expectedException \Exception
@@ -160,7 +157,6 @@ public function testSetGuestEmailOnCartWithGuestCheckoutDisabled()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
* @magentoConfigFixture default_store checkout/options/guest_checkout 0
*
* @expectedException \Exception
@@ -199,7 +195,6 @@ public function testSetPaymentOnCartWithGuestCheckoutDisabled()
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
* @magentoConfigFixture default_store checkout/options/guest_checkout 0
*
* @expectedException \Exception
@@ -248,7 +243,6 @@ public function testSetNewShippingAddressOnCartWithGuestCheckoutDisabled()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
* @magentoConfigFixture default_store checkout/options/guest_checkout 0
*
* @expectedException \Exception
@@ -285,8 +279,14 @@ public function testSetShippingMethodOnCartWithGuestCheckoutDisabled()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -294,7 +294,6 @@ public function testSetShippingMethodOnCartWithGuestCheckoutDisabled()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_guest_checkout.php
* @magentoConfigFixture default_store checkout/options/guest_checkout 0
*
* @expectedException \Exception
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index af1f72fe7162..3634403e0b23 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -73,7 +73,9 @@ public function testGetAvailablePaymentMethodsFromCustomerCart()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
+ * @magentoConfigFixture default_store payment/paypal_billing_agreement/active 0
+ * @magentoConfigFixture default_store payment/checkmo/active 0
+ * @magentoConfigFixture default_store payment/free/active 0
*/
public function testGetAvailablePaymentMethodsIfPaymentsAreNotPresent()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index 8703a690c62e..5d90d26d4983 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -103,7 +103,9 @@ public function testGetAvailableShippingMethodsFromCustomerCart()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 0
+ * @magentoConfigFixture default_store carriers/tablerate/active 0
+ * @magentoConfigFixture default_store carriers/freeshipping/active 0
*/
public function testGetAvailableShippingMethodsIfShippingMethodsAreNotPresent()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php
index a918279bada6..9536f078402a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php
@@ -30,7 +30,11 @@ protected function setUp()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
@@ -52,7 +56,11 @@ public function testGetSelectedPaymentMethod()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
*/
@@ -88,7 +96,11 @@ public function testGetSelectedPaymentMethodFromNonExistentCart()
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
index cbfad81b130a..2dc5b53b31c7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
@@ -54,8 +54,14 @@ protected function setUp()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -110,8 +116,14 @@ public function testPlaceOrderIfCartIdIsMissed()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -187,7 +199,9 @@ public function testPlaceOrderWithNoShippingMethod()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -208,7 +222,9 @@ public function testPlaceOrderWithNoBillingAddress()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -228,7 +244,9 @@ public function testPlaceOrderWithNoPaymentMethod()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -251,8 +269,14 @@ public function testPlaceOrderWithOutOfStockProduct()
* _security
* @magentoApiDataFixture Magento/Customer/_files/three_customers.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php
index 7ec3148ea85a..6c45227c4774 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php
@@ -39,7 +39,11 @@ protected function setUp()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*
* @param string $methodCode
* @param string $methodTitle
@@ -81,7 +85,11 @@ public function offlinePaymentMethodDataProvider(): array
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*/
public function testSetPurchaseOrderPaymentMethod()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
index ff2c5f2e6b52..bf3abe557ef8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
@@ -35,7 +35,9 @@ protected function setUp()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
*
* @param string $carrierCode
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php
index 5a063fcb2e43..50fd9647d7c5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php
@@ -148,8 +148,14 @@ public function testSetPaymentOnNonExistentCart()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index c3de80d08f0b..fdec9a1dd985 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -200,7 +200,11 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php
index 9dd0382a5dbe..8b6317bd76c3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php
@@ -37,7 +37,11 @@ protected function setUp()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*/
public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
{
@@ -80,7 +84,11 @@ public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoConfigFixture default_store payment/banktransfer/active 1
+ * @magentoConfigFixture default_store payment/cashondelivery/active 1
+ * @magentoConfigFixture default_store payment/checkmo/active 1
+ * @magentoConfigFixture default_store payment/purchaseorder/active 1
+ * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*
* @expectedException Exception
* @expectedExceptionMessage Purchase order number is a required field.
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 60c8bee75e2a..946c66a80938 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -115,7 +115,9 @@ public function testSetShippingMethodOnCartWithSimpleProductAndWithoutAddress()
}
/**
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -265,7 +267,9 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
}
/**
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoConfigFixture default_store carriers/flatrate/active 1
+ * @magentoConfigFixture default_store carriers/tablerate/active 1
+ * @magentoConfigFixture default_store carriers/freeshipping/active 1
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
index 200bae76e0ae..e01e07490051 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
@@ -45,7 +45,7 @@ protected function setUp()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/SendFriend/_files/enable_send_friend_guest.php
+ * @magentoConfigFixture default_store sendfriend/email/allow_guest 1
*/
public function testSendFriendGuestEnable()
{
@@ -66,7 +66,7 @@ public function testSendFriendGuestEnable()
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/SendFriend/_files/disable_send_friend_guest.php
+ * @magentoConfigFixture default_store sendfriend/email/allow_guest 0
* @expectedException \Exception
* @expectedExceptionMessage The current customer isn't authorized.
*/
@@ -90,7 +90,7 @@ public function testSendFriendGuestDisableAsGuest()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/SendFriend/_files/disable_send_friend_guest.php
+ * @magentoConfigFixture default_store sendfriend/email/allow_guest 0
*/
public function testSendFriendGuestDisableAsCustomer()
{
@@ -210,15 +210,11 @@ public function testErrors(string $input, string $errorMessage)
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * TODO: use magentoApiConfigFixture (to be merged https://github.com/magento/graphql-ce/pull/351)
+ * @magentoConfigFixture default_store sendfriend/email/max_per_hour 1
* @magentoApiDataFixture Magento/SendFriend/Fixtures/sendfriend_configuration.php
*/
public function testLimitMessagesPerHour()
{
-
- /** @var SendFriend $sendFriend */
- $sendFriend = $this->sendFriendFactory->create();
-
$productId = (int)$this->productRepository->get('simple_product')->getId();
$recipients = '{
name: "Recipient Name 1"
@@ -232,13 +228,11 @@ public function testLimitMessagesPerHour()
$this->expectException(\Exception::class);
$this->expectExceptionMessage(
- "You can't send messages more than {$sendFriend->getMaxSendsToFriend()} times an hour."
+ "You can't send messages more than 1 times an hour."
);
- $maxSendToFriends = $sendFriend->getMaxSendsToFriend();
- for ($i = 0; $i <= $maxSendToFriends + 1; $i++) {
- $this->graphQlMutation($query, [], '', $this->getHeaderMap());
- }
+ $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+ $this->graphQlMutation($query, [], '', $this->getHeaderMap());
}
/**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index a536022e3163..4657a1e763ae 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -25,7 +25,6 @@ class StoreConfigResolverTest extends GraphQlAbstract
protected function setUp()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index 7de689a6ad0f..e4343596d4e5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -83,7 +83,8 @@ protected function setUp()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
+ * @magentoConfigFixture default_store carriers/ups/active 1
+ * @magentoConfigFixture default_store carriers/ups/type UPS
*
* @dataProvider dataProviderShippingMethods
* @param string $methodCode
@@ -139,7 +140,8 @@ public function dataProviderShippingMethods(): array
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
- * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
+ * @magentoConfigFixture default_store carriers/ups/active 1
+ * @magentoConfigFixture default_store carriers/ups/type UPS
*
* @dataProvider dataProviderShippingMethodsBasedOnCanadaAddress
* @param string $methodCode
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
index dcac794703a5..1ec0b3eac6fc 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
@@ -39,6 +39,11 @@ class ConfigFixture
*/
private $_storeConfigValues = [];
+ /**
+ * @var string
+ */
+ protected $annotation = 'magentoConfigFixture';
+
/**
* Retrieve configuration node value
*
@@ -104,10 +109,10 @@ protected function _setConfigValue($configPath, $value, $storeCode = false)
protected function _assignConfigData(\PHPUnit\Framework\TestCase $test)
{
$annotations = $test->getAnnotations();
- if (!isset($annotations['method']['magentoConfigFixture'])) {
+ if (!isset($annotations['method'][$this->annotation])) {
return;
}
- foreach ($annotations['method']['magentoConfigFixture'] as $configPathAndValue) {
+ foreach ($annotations['method'][$this->annotation] as $configPathAndValue) {
if (preg_match('/^.+?(?=_store\s)/', $configPathAndValue, $matches)) {
/* Store-scoped config value */
$storeCode = $matches[0] != 'current' ? $matches[0] : null;
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation.php b/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation.php
deleted file mode 100644
index 41f2b210b32b..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation.php
+++ /dev/null
@@ -1,22 +0,0 @@
-get(WriterInterface::class);
-
-$configWriter->save(AccountConfirmation::XML_PATH_IS_CONFIRM, 1);
-
-$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation_rollback.php
deleted file mode 100644
index 72db06406b4a..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Customer/_files/enable_customer_account_confirmation_rollback.php
+++ /dev/null
@@ -1,17 +0,0 @@
-create(WriterInterface::class);
-
-$configWriter->delete('customer/create_account/confirm');
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
deleted file mode 100644
index 8e6d4b8f74b8..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
+++ /dev/null
@@ -1,35 +0,0 @@
-get(\Magento\Payment\Api\PaymentMethodListInterface::class);
-$rollbackConfigKey = 'test/payment/disabled_payment_methods';
-$configData = [];
-$disabledPaymentMethods = [];
-
-// Get all active Payment Methods
-foreach ($paymentMethodList->getActiveList(Store::DEFAULT_STORE_ID) as $paymentMethod) {
- $configData['payment/' . $paymentMethod->getCode() . '/active'] = 0;
- $disabledPaymentMethods[] = $paymentMethod->getCode();
-}
-// Remember all manually disabled Payment Methods for rollback
-$configData[$rollbackConfigKey] = implode(',', $disabledPaymentMethods);
-
-/** @var Config $defConfig */
-$defConfig = $objectManager->create(Config::class);
-$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
-
-foreach ($configData as $key => $value) {
- $defConfig->setDataByPath($key, $value);
- $defConfig->save();
-}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods_rollback.php
deleted file mode 100644
index 092826d1fd3f..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods_rollback.php
+++ /dev/null
@@ -1,34 +0,0 @@
-create(WriterInterface::class);
-$rollbackConfigValue = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
- ->getStore(\Magento\Store\Model\Store::DEFAULT_STORE_ID)
- ->getConfig($rollbackConfigKey);
-
-$disabledPaymentMethods = [];
-if (!empty($rollbackConfigValue)) {
- $disabledPaymentMethods = explode(',', $rollbackConfigValue);
-}
-
-if (count($disabledPaymentMethods)) {
- foreach ($disabledPaymentMethods as $keyToRemove) {
- $configWriter->delete(sprintf('payment/%s/active', $keyToRemove));
- }
-}
-$configWriter->delete($rollbackConfigKey);
-
-$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout.php
deleted file mode 100644
index 957c8831a3cb..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout.php
+++ /dev/null
@@ -1,21 +0,0 @@
-get(WriterInterface::class);
-
-$configWriter->save('checkout/options/guest_checkout', 0);
-
-$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout_rollback.php
deleted file mode 100644
index ed7941435ddd..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_guest_checkout_rollback.php
+++ /dev/null
@@ -1,17 +0,0 @@
-create(WriterInterface::class);
-
-$configWriter->delete('checkout/options/guest_checkout');
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
deleted file mode 100644
index c5d0468dbfac..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
+++ /dev/null
@@ -1,23 +0,0 @@
-get(WriterInterface::class);
-
-$configWriter->save('carriers/flatrate/active', 0);
-$configWriter->save('carriers/tablerate/active', 0);
-$configWriter->save('carriers/freeshipping/active', 0);
-
-$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods_rollback.php
deleted file mode 100644
index 384ffbdf51f3..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods_rollback.php
+++ /dev/null
@@ -1,19 +0,0 @@
-create(WriterInterface::class);
-
-$configWriter->delete('carriers/flatrate/active');
-$configWriter->delete('carriers/tablerate/active');
-$configWriter->delete('carriers/freeshipping/active');
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
deleted file mode 100644
index 79d61cf32b9f..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+++ /dev/null
@@ -1,25 +0,0 @@
-get(WriterInterface::class);
-
-$configWriter->save('payment/banktransfer/active', 1);
-$configWriter->save('payment/cashondelivery/active', 1);
-$configWriter->save('payment/checkmo/active', 1);
-$configWriter->save('payment/purchaseorder/active', 1);
-$configWriter->save('payment/authorizenet_acceptjs/active', 1);
-
-$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods_rollback.php
deleted file mode 100644
index 6c41e3ebabf0..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods_rollback.php
+++ /dev/null
@@ -1,21 +0,0 @@
-create(WriterInterface::class);
-
-$configWriter->delete('payment/banktransfer/active');
-$configWriter->delete('payment/cashondelivery/active');
-$configWriter->delete('payment/checkmo/active');
-$configWriter->delete('payment/purchaseorder/active');
-$configWriter->delete('payment/authorizenet_acceptjs/active');
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
deleted file mode 100644
index ebc41da9b1b3..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+++ /dev/null
@@ -1,23 +0,0 @@
-get(WriterInterface::class);
-
-$configWriter->save('carriers/flatrate/active', 1);
-$configWriter->save('carriers/tablerate/active', 1);
-$configWriter->save('carriers/freeshipping/active', 1);
-
-$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods_rollback.php
deleted file mode 100644
index 384ffbdf51f3..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods_rollback.php
+++ /dev/null
@@ -1,19 +0,0 @@
-create(WriterInterface::class);
-
-$configWriter->delete('carriers/flatrate/active');
-$configWriter->delete('carriers/tablerate/active');
-$configWriter->delete('carriers/freeshipping/active');
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/disable_send_friend_guest.php b/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/disable_send_friend_guest.php
deleted file mode 100644
index 80fcc2079a01..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/disable_send_friend_guest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-get(WriterInterface::class);
-
-$configWriter->save('sendfriend/email/allow_guest', '0');
-
-$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/enable_send_friend_guest.php b/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/enable_send_friend_guest.php
deleted file mode 100644
index aaf9a447aeaa..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/SendFriend/_files/enable_send_friend_guest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-get(WriterInterface::class);
-
-$configWriter->save('sendfriend/email/allow_guest', '1');
-
-$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php b/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
deleted file mode 100644
index 42931db75a43..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
+++ /dev/null
@@ -1,22 +0,0 @@
-get(WriterInterface::class);
-
-$configWriter->save('carriers/ups/active', 1);
-$configWriter->save('carriers/ups/type', "UPS");
-
-$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method_rollback.php
deleted file mode 100644
index cf6dc08dd91a..000000000000
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method_rollback.php
+++ /dev/null
@@ -1,18 +0,0 @@
-create(WriterInterface::class);
-
-$configWriter->delete('carriers/ups/active');
-$configWriter->delete('carriers/ups/type');
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
index f5851a55d760..8dbe9468923f 100644
--- a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
@@ -26,7 +26,8 @@ class SendmailTest extends AbstractController
*
* @magentoDbIsolation enabled
* @magentoAppIsolation enabled
- * @magentoDataFixture Magento/SendFriend/_files/disable_allow_guest_config.php
+ * @magentoConfigFixture default/sendfriend/email/allow_guest 0
+ * @magentoConfigFixture default/sendfriend/email/enabled 1
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Catalog/_files/products.php
*/
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php b/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php
deleted file mode 100644
index 202a39613248..000000000000
--- a/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php
+++ /dev/null
@@ -1,24 +0,0 @@
-create(Value::class);
-$config->setPath('sendfriend/email/enabled');
-$config->setScope('default');
-$config->setScopeId(0);
-$config->setValue(1);
-$config->save();
-
-/** @var Value $config */
-$config = Bootstrap::getObjectManager()->create(Value::class);
-$config->setPath('sendfriend/email/allow_guest');
-$config->setScope('default');
-$config->setScopeId(0);
-$config->setValue(0);
-$config->save();
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/_files/product_simple_rollback.php b/dev/tests/integration/testsuite/Magento/SendFriend/_files/product_simple_rollback.php
deleted file mode 100644
index ed98732fc870..000000000000
--- a/dev/tests/integration/testsuite/Magento/SendFriend/_files/product_simple_rollback.php
+++ /dev/null
@@ -1,26 +0,0 @@
-get(\Magento\Framework\Registry::class);
-
-$registry->unregister('isSecureArea');
-$registry->register('isSecureArea', true);
-
-/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-
-try {
- $product = $productRepository->get('simple', false, null, true);
- $productRepository->delete($product);
-} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
- //Product already removed
-}
-
-$registry->unregister('isSecureArea');
-$registry->register('isSecureArea', false);