Skip to content
This repository has been archived by the owner on Dec 19, 2019. It is now read-only.

Commit

Permalink
Update tests to use @magentoConfigFixture
Browse files Browse the repository at this point in the history 
Deletes configuration data fixtures no longer in use
  • Loading branch information
@pmclain
pmclain committed Jul 30, 2019
1 parent f69b080 commit 74601cc
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 80 deletions.
44 changes: 34 additions & 10 deletions ...ests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,19 @@ protected function setUp()
}

/**
* @magentoConfigFixture carriers/flatrate/active 1
* @magentoConfigFixture payment/braintree/active 1
* @magentoConfigFixture payment/braintree/environment sandbox
* @magentoConfigFixture payment/braintree/merchant_id def_merchant_id
* @magentoConfigFixture payment/braintree/public_key def_public_key
* @magentoConfigFixture payment/braintree/private_key def_private_key
* @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/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/set_new_billing_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
* @magentoApiDataFixture Magento/GraphQl/Braintree/_files/enable_braintree_payment.php
*/
public function testPlaceOrder()
{
Expand All @@ -113,15 +117,20 @@ public function testPlaceOrder()
}

/**
* @magentoConfigFixture carriers/flatrate/active 1
* @magentoConfigFixture payment/braintree/active 1
* @magentoConfigFixture payment/braintree_cc_vault/active 1
* @magentoConfigFixture payment/braintree/environment sandbox
* @magentoConfigFixture payment/braintree/merchant_id def_merchant_id
* @magentoConfigFixture payment/braintree/public_key def_public_key
* @magentoConfigFixture payment/braintree/private_key def_private_key
* @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/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/set_new_billing_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
* @magentoApiDataFixture Magento/GraphQl/Braintree/_files/enable_braintree_payment.php
*/
public function testPlaceOrderSaveInVault()
{
Expand Down Expand Up @@ -153,15 +162,20 @@ public function testPlaceOrderSaveInVault()
}

/**
* @magentoConfigFixture carriers/flatrate/active 1
* @magentoConfigFixture payment/braintree/active 1
* @magentoConfigFixture payment/braintree_cc_vault/active 1
* @magentoConfigFixture payment/braintree/environment sandbox
* @magentoConfigFixture payment/braintree/merchant_id def_merchant_id
* @magentoConfigFixture payment/braintree/public_key def_public_key
* @magentoConfigFixture payment/braintree/private_key def_private_key
* @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/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/set_new_billing_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
* @magentoApiDataFixture Magento/GraphQl/Braintree/_files/enable_braintree_payment.php
* @magentoApiDataFixture Magento/GraphQl/Braintree/_files/token.php
*/
public function testPlaceOrderWithVault()
Expand All @@ -184,15 +198,20 @@ public function testPlaceOrderWithVault()
}

/**
* @magentoConfigFixture carriers/flatrate/active 1
* @magentoConfigFixture payment/braintree/active 1
* @magentoConfigFixture payment/braintree_cc_vault/active 1
* @magentoConfigFixture payment/braintree/environment sandbox
* @magentoConfigFixture payment/braintree/merchant_id def_merchant_id
* @magentoConfigFixture payment/braintree/public_key def_public_key
* @magentoConfigFixture payment/braintree/private_key def_private_key
* @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/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/set_new_billing_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
* @magentoApiDataFixture Magento/GraphQl/Braintree/_files/enable_braintree_payment.php
* @dataProvider dataProviderTestSetPaymentMethodInvalidInput
* @expectedException \Exception
* @param string $methodCode
Expand All @@ -211,15 +230,20 @@ public function testSetPaymentMethodInvalidInput(string $methodCode)
}

/**
* @magentoConfigFixture carriers/flatrate/active 1
* @magentoConfigFixture payment/braintree/active 1
* @magentoConfigFixture payment/braintree_cc_vault/active 1
* @magentoConfigFixture payment/braintree/environment sandbox
* @magentoConfigFixture payment/braintree/merchant_id def_merchant_id
* @magentoConfigFixture payment/braintree/public_key def_public_key
* @magentoConfigFixture payment/braintree/private_key def_private_key
* @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/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/set_new_billing_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
* @magentoApiDataFixture Magento/GraphQl/Braintree/_files/enable_braintree_payment.php
* @dataProvider dataProviderTestSetPaymentMethodInvalidInput
* @expectedException \Exception
* @param string $methodCode
Expand Down
22 changes: 18 additions & 4 deletions dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Guest/SetPaymentMethodTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,19 @@ protected function setUp()
}

/**
* @magentoConfigFixture carriers/flatrate/active 1
* @magentoConfigFixture payment/braintree/active 1
* @magentoConfigFixture payment/braintree/environment sandbox
* @magentoConfigFixture payment/braintree/merchant_id def_merchant_id
* @magentoConfigFixture payment/braintree/public_key def_public_key
* @magentoConfigFixture payment/braintree/private_key def_private_key
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
* @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
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
* @magentoApiDataFixture Magento/GraphQl/Braintree/_files/enable_braintree_payment.php
* @dataProvider dataProviderTestPlaceOrder
*/
public function testPlaceOrder(string $nonce)
Expand Down Expand Up @@ -100,15 +104,19 @@ public function dataProviderTestPlaceOrder(): array
}

/**
* @magentoConfigFixture carriers/flatrate/active 1
* @magentoConfigFixture payment/braintree/active 1
* @magentoConfigFixture payment/braintree/environment sandbox
* @magentoConfigFixture payment/braintree/merchant_id def_merchant_id
* @magentoConfigFixture payment/braintree/public_key def_public_key
* @magentoConfigFixture payment/braintree/private_key def_private_key
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
* @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
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
* @magentoApiDataFixture Magento/GraphQl/Braintree/_files/enable_braintree_payment.php
* @expectedException \Exception
*/
public function testSetPaymentMethodInvalidInput()
Expand All @@ -122,6 +130,12 @@ public function testSetPaymentMethodInvalidInput()
}

/**
* @magentoConfigFixture carriers/flatrate/active 1
* @magentoConfigFixture payment/braintree/active 1
* @magentoConfigFixture payment/braintree/environment sandbox
* @magentoConfigFixture payment/braintree/merchant_id def_merchant_id
* @magentoConfigFixture payment/braintree/public_key def_public_key
* @magentoConfigFixture payment/braintree/private_key def_private_key
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
Expand Down
35 changes: 0 additions & 35 deletions ...tests/integration/testsuite/Magento/GraphQl/Braintree/_files/enable_braintree_payment.php
View file

This file was deleted.

31 changes: 0 additions & 31 deletions ...egration/testsuite/Magento/GraphQl/Braintree/_files/enable_braintree_payment_rollback.php
View file

This file was deleted.

0 comments on commit 74601cc

Please sign in to comment.