Skip to content

Commit 243939c

Browse files
okolesnykokolesnyk
authored
Merge pull request #736 from magento-qmt/PR
[Mavericks] Extend functional tests coverage Tasks: - MTA-3896: Add variation for Place order via Payflow Pro with success AVS ZIP verification - MTA-3898: Add variation for Place order via Payflow Pro with success CVV verification - MTA-3895: Add variation to CreateOnlineCreditmemoTest with PayPal Payflow Pro - MTA-3900: Create auto test to Refund an order placed through Braintree with full capture - MTA-3952: Refactoring comments history block in Order module - MTA-3901: Add variation for Partial Refund an order placed through Braintree with Partial capture
2 parents 1a991f4 + 1272a52 commit 243939c

File tree

51 files changed

+900
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+900
-324
lines changed

‎dev/tests/functional/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"magento/mtf": "1.0.0-rc51",
3+
"magento/mtf": "1.0.0-rc52",
44
"php": "~5.6.5|7.0.2|~7.0.6",
55
"phpunit/phpunit": "~4.8.0|~5.5.0",
66
"phpunit/phpunit-selenium": ">=1.2"

‎dev/tests/functional/etc/repository_replacer_payments.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2013-2017 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/Magento/Mtf/Repository/etc/repository.xsd">
9+
<repository class="Magento\Braintree\Test\Repository\BraintreeSandboxCustomer">
10+
<dataset name="braintree_sandbox_default">
11+
<field name="environment" xsi:type="string">BRAINTREEE_ENVIRONMENT</field>
12+
<field name="merchantId" xsi:type="string">BRAINTREEE_MERCHANT_ID</field>
13+
<field name="publicKey" xsi:type="string">BRAINTREE_PUBLIC_KEY</field>
14+
<field name="privateKey" xsi:type="string">BRAINTREE_PRIVATE_KEY</field>
15+
</dataset>
16+
</repository>
17+
</config>

‎dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertTransactionIsPresentInSettlementReport.php

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
1212

1313
/**
14-
* Class AssertTransactionIsPresentInSettlementReport
14+
* Assert that comment with transaction id exists in Comments History section on order page in Admin.
1515
*/
1616
class AssertTransactionIsPresentInSettlementReport extends AbstractConstraint
1717
{
@@ -26,6 +26,8 @@ class AssertTransactionIsPresentInSettlementReport extends AbstractConstraint
2626
private $settlementReportIndex;
2727

2828
/**
29+
* Assert that comment with transaction id exists in Comments History section on order page in Admin.
30+
*
2931
* @param $orderId
3032
* @param OrderIndex $orderIndex
3133
* @param SalesOrderView $salesOrderView
@@ -58,23 +60,28 @@ public function processAssert(
5860
}
5961

6062
/**
61-
* @inheritdoc
63+
* Returns a string representation of the object.
64+
*
65+
* @return string
6266
*/
6367
public function toString()
6468
{
6569
return 'Transaction is present in settlement report.';
6670
}
6771

6872
/**
69-
* Get transaction id from order comments
70-
* @return mixed
73+
* Get transaction id from order comments.
74+
*
75+
* @return null|string
7176
*/
7277
private function getTransactionId()
7378
{
74-
$comments = $this->salesOrderView->getOrderHistoryBlock()->getCommentsHistory();
79+
/** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
80+
$infoTab = $this->salesOrderView->getOrderForm()->openTab('info')->getTab('info');
81+
$latestComment = $infoTab->getCommentsHistoryBlock()->getLatestComment();
7582
$transactionId = null;
7683

77-
preg_match('/(\w+-*\w+)"/', $comments, $matches);
84+
preg_match('/(\w+-*\w+)"/', $latestComment['comment'], $matches);
7885
if (!empty($matches[1])) {
7986
$transactionId = $matches[1];
8087
}

‎dev/tests/functional/tests/app/Magento/Braintree/Test/Fixture/BraintreeSandboxCustomer.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2013-2017 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/fixture.xsd">
9+
<fixture name="braintree_sandbox_customer"
10+
module="Magento_Braintree"
11+
type="virtual"
12+
repository_class="Magento\Braintree\Test\Repository\BraintreeSandboxCustomer"
13+
class="Magento\Braintree\Test\Fixture\BraintreeSandboxCustomer">
14+
<field name="environment" />
15+
<field name="merchantId" />
16+
<field name="publicKey" />
17+
<field name="privateKey" />
18+
</fixture>
19+
</config>

‎dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/BraintreeSandboxCustomer.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
/**
4+
* Copyright © 2013-2017 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/Magento/Mtf/Repository/etc/repository.xsd">
9+
<repository class="Magento\Braintree\Test\Repository\BraintreeSandboxCustomer">
10+
<dataset name="braintree_sandbox_default">
11+
<field name="environment" xsi:type="string">BRAINTREEE_ENVIRONMENT</field>
12+
<field name="merchantId" xsi:type="string">BRAINTREEE_MERCHANT_ID</field>
13+
<field name="publicKey" xsi:type="string">BRAINTREE_PUBLIC_KEY</field>
14+
<field name="privateKey" xsi:type="string">BRAINTREE_PRIVATE_KEY</field>
15+
</dataset>
16+
</repository>
17+
</config>

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

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,24 @@
1111
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
1212
<data name="products/1" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
1313
<data name="customer/dataset" xsi:type="string">default</data>
14-
<data name="checkoutMethod" xsi:type="string">login</data>
14+
<data name="checkoutMethod" xsi:type="string">guest</data>
1515
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
16-
<data name="refundedPrices" xsi:type="array">
17-
<item name="0" xsi:type="string">139.90</item>
16+
<data name="order/data/refund" xsi:type="array">
17+
<item name="0" xsi:type="array">
18+
<item name="invoiceId" xsi:type="string">0</item>
19+
</item>
20+
</data>
21+
<data name="order/data/price/refund" xsi:type="array">
22+
<item name="0" xsi:type="array">
23+
<item name="grand_creditmemo_total" xsi:type="string">139.90</item>
24+
</item>
1825
</data>
1926
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
2027
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
2128
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
2229
<data name="payment/method" xsi:type="string">braintree_paypal</data>
2330
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_sale, braintree_paypal_skip_order_review</data>
2431
<data name="paymentAction" xsi:type="string">sale</data>
25-
<data name="data/items_data/0/qty" xsi:type="string">-</data>
2632
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
2733
<constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
2834
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCreditMemoTab" />
@@ -31,20 +37,35 @@
3137
<variation name="CreateOnlineCreditMemoBraintreePaypalTestVariation2" summary="Partial refund of order placed within Braintree PayPal" ticketId="MAGETWO-48698">
3238
<data name="products/0" xsi:type="string">catalogProductSimple::simple_for_sales</data>
3339
<data name="customer/dataset" xsi:type="string">default</data>
34-
<data name="checkoutMethod" xsi:type="string">login</data>
40+
<data name="checkoutMethod" xsi:type="string">guest</data>
3541
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
36-
<data name="refundedPrices" xsi:type="array">
37-
<item name="0" xsi:type="string">621.20</item>
42+
<data name="order/data/refund" xsi:type="array">
43+
<item name="0" xsi:type="array">
44+
<item name="invoiceId" xsi:type="string">0</item>
45+
<item name="items_data" xsi:type="array">
46+
<item name="0" xsi:type="array">
47+
<item name="qty" xsi:type="string">1</item>
48+
</item>
49+
</item>
50+
</item>
51+
<item name="1" xsi:type="array">
52+
<item name="invoiceId" xsi:type="string">0</item>
53+
</item>
54+
</data>
55+
<data name="order/data/price/refund" xsi:type="array">
56+
<item name="0" xsi:type="array">
57+
<item name="grand_creditmemo_total" xsi:type="string">621.20</item>
58+
</item>
59+
<item name="1" xsi:type="array">
60+
<item name="grand_creditmemo_total" xsi:type="string">606.20</item>
61+
</item>
3862
</data>
3963
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
4064
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
4165
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
4266
<data name="payment/method" xsi:type="string">braintree_paypal</data>
4367
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
4468
<data name="data/items_data/0/qty" xsi:type="string">2</data>
45-
<data name="refundData/items_data/0/qty" xsi:type="string">1</data>
46-
<data name="order/dataset" xsi:type="string">default</data>
47-
<data name="isCreditMemoPartial" xsi:type="string">Yes</data>
4869
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
4970
<constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
5071
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCreditMemoTab" />

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
/**
3+
* Copyright © 2013-2017 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Braintree\Test\TestCase;
7+
8+
use Magento\Mtf\TestCase\Scenario;
9+
10+
/**
11+
* Preconditions:
12+
* 1. Full capture of order placed within Braintree.
13+
*
14+
* Steps:
15+
* 1. Log in to Admin.
16+
* 2. Open created order.
17+
* 3. Create credit memo.
18+
* 4. Perform assertions.
19+
*
20+
* @group Braintree
21+
* @ZephyrId MAGETWO-38324
22+
*/
23+
class CreateOnlineCreditMemoBraintreeTest extends Scenario
24+
{
25+
/* tags */
26+
const MVP = 'yes';
27+
const TEST_TYPE = '3rd_party_test';
28+
const SEVERITY = 'S1';
29+
/* end tags */
30+
31+
/**
32+
* Runs test for online credit memo creation for order placed via Braintree Credit Card.
33+
*
34+
* @return void
35+
*/
36+
public function test()
37+
{
38+
$this->executeScenario();
39+
}
40+
}

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

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2013-2017 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\CreateOnlineCreditMemoBraintreeTest" summary="Create online credit memo for Braintree credit card" ticketId="MAGETWO-38324">
10+
<variation name="CreateOnlineCreditMemoBraintreeTestVariation1" summary="Refund an order placed through Braintree with full capture" ticketId="MAGETWO-38324">
11+
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
12+
<data name="products" xsi:type="array">
13+
<item name="0" xsi:type="string">catalogProductSimple::product_10_dollar</item>
14+
<item name="1" xsi:type="string">configurableProduct::with_one_option</item>
15+
<item name="2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</item>
16+
</data>
17+
<data name="customer/dataset" xsi:type="string">default</data>
18+
<data name="braintreeSandboxCustomer/dataset" xsi:type="string">braintree_sandbox_default</data>
19+
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
20+
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
21+
<data name="checkoutMethod" xsi:type="string">guest</data>
22+
<data name="shipping" xsi:type="array">
23+
<item name="shipping_service" xsi:type="string">Flat Rate</item>
24+
<item name="shipping_method" xsi:type="string">Fixed</item>
25+
</data>
26+
<data name="payment/method" xsi:type="string">braintree</data>
27+
<data name="creditCard/dataset" xsi:type="string">visa_default</data>
28+
<data name="creditCard/data/payment_code" xsi:type="string">braintree</data>
29+
<data name="configData" xsi:type="string">braintree</data>
30+
<data name="status" xsi:type="string">Closed</data>
31+
<data name="order/data/refund" xsi:type="array">
32+
<item name="0" xsi:type="array">
33+
<item name="invoiceId" xsi:type="string">0</item>
34+
</item>
35+
</data>
36+
<data name="order/data/price/refund" xsi:type="array">
37+
<item name="0" xsi:type="array">
38+
<item name="grand_creditmemo_total" xsi:type="string">145.98</item>
39+
</item>
40+
</data>
41+
<data name="transactions/refund" xsi:type="array">
42+
<item name="transactionType" xsi:type="string">Refund</item>
43+
<item name="statusIsClosed" xsi:type="string">Yes</item>
44+
</data>
45+
<constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
46+
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCommentsHistory" />
47+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
48+
<constraint name="Magento\Sales\Test\Constraint\AssertTransactionStatus" />
49+
</variation>
50+
<variation name="CreateOnlineCreditMemoBraintreeTestVariation2" summary="Partial Refund an order placed through Braintree with Partial capture" ticketId="MAGETWO-38325">
51+
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
52+
<data name="products" xsi:type="array">
53+
<item name="0" xsi:type="string">catalogProductSimple::product_10_dollar</item>
54+
<item name="1" xsi:type="string">configurableProduct::with_one_option</item>
55+
<item name="2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</item>
56+
</data>
57+
<data name="customer/dataset" xsi:type="string">default</data>
58+
<data name="braintreeSandboxCustomer/dataset" xsi:type="string">braintree_sandbox_default</data>
59+
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
60+
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
61+
<data name="checkoutMethod" xsi:type="string">guest</data>
62+
<data name="shipping" xsi:type="array">
63+
<item name="shipping_service" xsi:type="string">Flat Rate</item>
64+
<item name="shipping_method" xsi:type="string">Fixed</item>
65+
</data>
66+
<data name="payment/method" xsi:type="string">braintree</data>
67+
<data name="creditCard/dataset" xsi:type="string">visa_default</data>
68+
<data name="creditCard/data/payment_code" xsi:type="string">braintree</data>
69+
<data name="configData" xsi:type="string">braintree</data>
70+
<data name="status" xsi:type="string">Processing</data>
71+
<data name="order/data/refund" xsi:type="array">
72+
<item name="0" xsi:type="array">
73+
<item name="invoiceId" xsi:type="string">0</item>
74+
<item name="items_data" xsi:type="array">
75+
<item name="1" xsi:type="array">
76+
<item name="qty" xsi:type="string">0</item>
77+
</item>
78+
</item>
79+
</item>
80+
<item name="1" xsi:type="array">
81+
<item name="invoiceId" xsi:type="string">0</item>
82+
</item>
83+
</data>
84+
<data name="order/data/price/refund" xsi:type="array">
85+
<item name="0" xsi:type="array">
86+
<item name="grand_creditmemo_total" xsi:type="string">134.07</item>
87+
</item>
88+
<item name="1" xsi:type="array">
89+
<item name="grand_creditmemo_total" xsi:type="string">1.08</item>
90+
</item>
91+
</data>
92+
<data name="data/items_data" xsi:type="array">
93+
<item name="0" xsi:type="array">
94+
<item name="qty" xsi:type="string">0</item>
95+
</item>
96+
</data>
97+
<constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
98+
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCommentsHistory" />
99+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
100+
</variation>
101+
</testCase>
102+
</config>

0 commit comments

Comments
 (0)