Skip to content

Commit 1bda4bf

Browse files
dkvashninbaydkvashninbay
committed
Merge pull request #407 from magento-mpi/MAGETWO-47617
[MPI] Functional tests
2 parents 487f5f4 + 3651a2d commit 1bda4bf

22 files changed

+609
-12
lines changed

‎dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Form/Cc.xml

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<mapping strict="1">
8+
<mapping strict="0">
99
<wrapper>payment</wrapper>
1010
<fields>
1111
<cc_number />

‎dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Paypal/PopupWindow.php

100644100755
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,14 @@ public function process()
4747
$this->browser->selectWindow();
4848
$this->waitForFormLoaded();
4949
$this->browser->find($this->submitButton)->click();
50-
$this->waitForElementNotVisible($this->selector);
50+
/**
51+
* This try/catch is intended as workaround in case if popup window is closed instantly and #login-preview
52+
* selector cannot be found.
53+
*/
54+
try {
55+
$this->waitForElementNotVisible($this->selector);
56+
} catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
57+
}
5158
$this->browser->selectWindow();
5259
$this->waitForElementNotVisible($this->loader);
5360
}

‎dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/DeleteSavedCreditCardTest.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Vault\Test\TestCase\DeleteSavedCreditCardTest" summary="Delete saved with Braintree credit card from customer account">
10+
<variation name="DeleteSavedCreditCardTestVariation2" summary="Delete saved with Braintree credit card from customer account" ticketId="MAGETWO-38487">
11+
<data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
12+
<data name="customer/dataset" xsi:type="string">default</data>
13+
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
14+
<data name="checkoutMethod" xsi:type="string">login</data>
15+
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
16+
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
17+
<data name="payment/method" xsi:type="string">braintreetwo</data>
18+
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
19+
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
20+
<data name="creditCardSave" xsi:type="string">Yes</data>
21+
<data name="configData" xsi:type="string">braintreetwo, braintreetwo_use_vault</data>
22+
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
23+
<constraint name="Magento\Vault\Test\Constraint\AssertCreditCardNotPresentOnCheckout" />
24+
</variation>
25+
</testCase>
26+
</config>

‎dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Braintree\Test\TestCase;
8+
9+
use Magento\Mtf\TestCase\Scenario;
10+
11+
/**
12+
* Preconditions:
13+
* 1. Order 1 is placed with Braintree PayPal.
14+
*
15+
* Steps:
16+
* 1. Log in to Admin.
17+
* 2. Go to Sales > Orders page.
18+
* 3. Open order 1.
19+
* 4. Click Invoice button.
20+
* 5. Ensure Capture Online is selected, click Submit Invoice button.
21+
* 6. Open Invoices tab.
22+
* 7. Perform assertions.
23+
*
24+
* @group Braintree_(CS)
25+
* @ZephyrId MAGETWO-48614, MAGETWO-48615
26+
*/
27+
class InvoicePayPalBraintreeTest extends Scenario
28+
{
29+
/* tags */
30+
const MVP = 'yes';
31+
const DOMAIN = 'CS';
32+
const TEST_TYPE = '3rd_party_test';
33+
/* end tags */
34+
35+
/**
36+
* Runs one page checkout test.
37+
*
38+
* @return void
39+
*/
40+
public function test()
41+
{
42+
$this->executeScenario();
43+
}
44+
}

‎dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Braintree\Test\TestCase\InvoicePayPalBraintreeTest" summary="Capture for order placed within PayPal Braintree">
10+
<variation name="InvoicePayPalBraintreeTestVariation1" summary="Full capture of order placed within Braintree PayPal" ticketId="MAGETWO-48614">
11+
<data name="description" xsi:type="string">Full capture of order placed within Braintree PayPal</data>
12+
<data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, bundleProduct::bundle_fixed_100_dollar_product</data>
13+
<data name="taxRule" xsi:type="string">us_illinois_tax_rule</data>
14+
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
15+
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
16+
<data name="prices" xsi:type="array">
17+
<item name="grandTotal" xsi:type="string">139.9</item>
18+
</data>
19+
<data name="capturedPrices" xsi:type="array">
20+
<item name="0" xsi:type="string">139.9</item>
21+
</data>
22+
<data name="payment/method" xsi:type="string">braintreetwo_paypal</data>
23+
<data name="configData" xsi:type="string">braintreetwo, braintreetwo_paypal</data>
24+
<data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship</data>
25+
<data name="data/items_data/0/qty" xsi:type="string">-</data>
26+
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
27+
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
28+
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
29+
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
30+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
31+
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceItems" />
32+
</variation>
33+
<variation name="InvoicePayPalBraintreeTestVariation2" summary="Partial capture for order placed within Braintree PayPal" ticketId="MAGETWO-48615">
34+
<data name="description" xsi:type="string">Partial capture for order placed within Braintree PayPal</data>
35+
<data name="products" xsi:type="string">catalogProductSimple::product_100_dollar</data>
36+
<data name="taxRule" xsi:type="string">us_illinois_tax_rule</data>
37+
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
38+
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
39+
<data name="isInvoicePartial" xsi:type="string">Yes</data>
40+
<data name="prices" xsi:type="array">
41+
<item name="grandTotal" xsi:type="string">226.50</item>
42+
</data>
43+
<data name="capturedPrices" xsi:type="array">
44+
<item name="0" xsi:type="string">118.25</item>
45+
<item name="1" xsi:type="string">108.25</item>
46+
</data>
47+
<data name="payment/method" xsi:type="string">braintreetwo_paypal</data>
48+
<data name="configData" xsi:type="string">braintreetwo, braintreetwo_paypal</data>
49+
<data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship</data>
50+
<data name="data/items_data/0/qty" xsi:type="string">1</data>
51+
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
52+
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
53+
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
54+
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
55+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
56+
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceItems" />
57+
</variation>
58+
</testCase>
59+
</config>

‎dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,13 @@
6262
<step name="fillBillingInformation" module="Magento_Checkout" next="placeOrder"/>
6363
<step name="placeOrder" module="Magento_Checkout"/>
6464
</scenario>
65+
<scenario name="InvoicePayPalBraintreeTest" firstStep="setupConfiguration">
66+
<step name="setupConfiguration" module="Magento_Config" next="createTaxRule" />
67+
<step name="createTaxRule" module="Magento_Tax" next="createProducts" />
68+
<step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
69+
<step name="addProductsToTheCart" module="Magento_Checkout" next="checkoutWithPaypalFromCart" />
70+
<step name="checkoutWithPaypalFromCart" module="Magento_Braintree" next="expressCheckoutOrderPlace" />
71+
<step name="expressCheckoutOrderPlace" module="Magento_Paypal" next="createInvoice" />
72+
<step name="createInvoice" module="Magento_Sales" />
73+
</scenario>
6574
</config>

‎dev/tests/functional/tests/app/Magento/Paypal/Test/Constraint/AssertExpressSuccessfullyCancelledMessage.php renamed to ‎dev/tests/functional/tests/app/Magento/Paypal/Test/Constraint/AssertExpressCancelledMessage.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,37 @@
1010
use Magento\Mtf\Constraint\AbstractConstraint;
1111

1212
/**
13-
* Class AssertOrderSuccessPlacedMessage
13+
* Class AssertExpressCancelledMessage
1414
* Assert that success message is correct
1515
*/
16-
class AssertExpressSuccessfullyCancelledMessage extends AbstractConstraint
16+
class AssertExpressCancelledMessage extends AbstractConstraint
1717
{
1818
/**
19-
* Message of success checkout
19+
* Message of cancelled PayPal Express checkout.
2020
*/
2121
const SUCCESS_MESSAGE = 'Express Checkout has been canceled.';
2222

2323
/**
24-
* Assert that success message is correct
24+
* Assert that success message is correct.
25+
*
2526
* @param CheckoutCart $checkoutCart
2627
*/
2728
public function processAssert(CheckoutCart $checkoutCart)
2829
{
2930
\PHPUnit_Framework_Assert::assertEquals(
3031
self::SUCCESS_MESSAGE,
3132
$checkoutCart->getMessagesBlock()->getSuccessMessage(),
32-
'Wrong success message is displayed.'
33+
'Success message about Express Checkout cancellation is not present or wrong.'
3334
);
3435
}
3536

3637
/**
37-
* Returns string representation of successful assertion
38+
* Returns string representation of successful assertion.
3839
*
3940
* @return string
4041
*/
4142
public function toString()
4243
{
43-
return 'Success message on Shopping Cart page is correct.';
44+
return 'Success message about Express Checkout cancellation is present.';
4445
}
4546
}

‎dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/DeleteSavedCreditCardTest.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Vault\Test\TestCase\DeleteSavedCreditCardTest" summary="Delete saved with Payflow Pro credit card from customer account">
10+
<variation name="DeleteSavedCreditCardTestVariation1" summary="Delete saved with Payflow Pro credit card from customer account" ticketId="MAGETWO-48086">
11+
<data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
12+
<data name="customer/dataset" xsi:type="string">default</data>
13+
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
14+
<data name="checkoutMethod" xsi:type="string">login</data>
15+
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
16+
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
17+
<data name="payment/method" xsi:type="string">payflowpro</data>
18+
<data name="creditCardClass" xsi:type="string">credit_card</data>
19+
<data name="creditCard/dataset" xsi:type="string">visa_default</data>
20+
<data name="creditCardSave" xsi:type="string">Yes</data>
21+
<data name="configData" xsi:type="string">payflowpro, payflowpro_use_vault</data>
22+
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
23+
<constraint name="Magento\Vault\Test\Constraint\AssertCreditCardNotPresentOnCheckout" />
24+
</variation>
25+
</testCase>
26+
</config>

‎dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
1212
<data name="configData" xsi:type="string">paypal_express, paypal_express_in_context</data>
1313
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
14-
<constraint name="Magento\Paypal\Test\Constraint\AssertExpressSuccessfullyCancelledMessage" />
14+
<constraint name="Magento\Paypal\Test\Constraint\AssertExpressCancelledMessage" />
1515
</variation>
1616
</testCase>
1717
</config>

‎dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<data name="payment/method" xsi:type="string">paypal_express</data>
2020
<data name="configData" xsi:type="string">paypal_express_in_context, paypal_express, freeshipping</data>
2121
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
22-
<constraint name="Magento\Paypal\Test\Constraint\AssertExpressSuccessfullyCancelledMessage" />
22+
<constraint name="Magento\Paypal\Test\Constraint\AssertExpressCancelledMessage" />
2323
</variation>
2424
</testCase>
2525
</config>

0 commit comments

Comments
 (0)