Skip to content

Commit 6262969

Browse files
author
Dmytro Aponasenko
committed
MTA-2712: Functional test maintenance. Part 1
1 parent 9de8519 commit 6262969

File tree

28 files changed

+162
-84
lines changed

28 files changed

+162
-84
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-rc35",
3+
"magento/mtf": "1.0.0-rc36",
44
"php": "~5.5.0|~5.6.0|~7.0.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2"

‎dev/tests/functional/lib/Magento/Mtf/Handler/Webapi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/**
1414
* Abstract class for webapi handlers.
1515
*/
16-
abstract class Webapi implements HandlerInterface
16+
abstract class Webapi extends Curl implements HandlerInterface
1717
{
1818
/**
1919
* Configuration parameters array.

‎dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest">
9+
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="One page check out with Authorize.Net payment method.">
1010
<variation name="OnePageCheckoutAuthorizenetTestVariation1" summary="Check Out as a Guest with Authorize.Net and Offline Shipping method" ticketId="MAGETWO-12832">
1111
<data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
1212
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
1313
<data name="customer/dataset" xsi:type="string">default</data>
14-
<data name="billingAddress/dataset" xsi:type="string">US_address_1</data>
14+
<data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
1515
<data name="checkoutMethod" xsi:type="string">guest</data>
1616
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
1717
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>

‎dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
use Magento\Mtf\TestStep\TestStepInterface;
1111

1212
/**
13-
* Creating catalog rule
13+
* Creating catalog rule.
1414
*/
1515
class CreateCatalogRuleStep implements TestStepInterface
1616
{
1717
/**
18-
* Catalog Rule dataset name
18+
* Catalog Rule dataset name.
1919
*
2020
* @var string
2121
*/
2222
protected $catalogRule;
2323

2424
/**
25-
* Factory for Fixture
25+
* Factory for Fixture.
2626
*
2727
* @var FixtureFactory
2828
*/
@@ -36,7 +36,7 @@ class CreateCatalogRuleStep implements TestStepInterface
3636
protected $deleteAllCatalogRule;
3737

3838
/**
39-
* Preparing step properties
39+
* Preparing step properties.
4040
*
4141
* @constructor
4242
* @param FixtureFactory $fixtureFactory
@@ -51,7 +51,7 @@ public function __construct(FixtureFactory $fixtureFactory, DeleteAllCatalogRule
5151
}
5252

5353
/**
54-
* Create catalog rule
54+
* Create catalog rule.
5555
*
5656
* @return array
5757
*/
@@ -76,6 +76,8 @@ public function run()
7676
*/
7777
public function cleanup()
7878
{
79-
$this->deleteAllCatalogRule->run();
79+
if ($this->catalogRule != '-') {
80+
$this->deleteAllCatalogRule->run();
81+
}
8082
}
8183
}

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class Totals extends Block
9797
*
9898
* @var string
9999
*/
100-
protected $blockWaitElement = '._block-content-loading';
100+
protected $blockWaitElement = '.loading-mask';
101101

102102
/**
103103
* Get Grand Total Text

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method/Billing.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Billing extends Form
2020
*
2121
* @var string
2222
*/
23-
protected $updateButtonSelector = '.action-toolbar .action-update';
23+
protected $updateButtonSelector = '.action.action-update';
2424

2525
/**
2626
* Wait element.

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method/Billing.xml

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,40 @@
99
<wrapper>billingAddress</wrapper>
1010
<fields>
1111
<email>
12-
<selector>[name='customerDetails[email]']</selector>
12+
<selector>./ancestor::*[contains(@class, 'checkout-payment-method')]//input[contains(@name, 'username')]</selector>
13+
<strategy>xpath</strategy>
1314
</email>
14-
<firstname />
15-
<lastname />
16-
<company />
15+
<firstname>
16+
<selector>input[name*=firstname]</selector>
17+
</firstname>
18+
<lastname>
19+
<selector>input[name*=lastname]</selector>
20+
</lastname>
21+
<company>
22+
<selector>input[name*=company]</selector>
23+
</company>
1724
<street>
18-
<selector>[name='billingAddress[street][0]']</selector>
25+
<selector>input[name*='street[0]']</selector>
1926
</street>
20-
<city />
27+
<city>
28+
<selector>input[name*=city]</selector>
29+
</city>
2130
<region_id>
31+
<selector>select[name*=region_id]</selector>
2232
<input>select</input>
2333
</region_id>
24-
<postcode />
34+
<region>
35+
<selector>input[name*=region]</selector>
36+
</region>
37+
<postcode>
38+
<selector>input[name*=postcode]</selector>
39+
</postcode>
2540
<country_id>
41+
<selector>select[name*=country_id]</selector>
2642
<input>select</input>
2743
</country_id>
28-
<telephone />
44+
<telephone>
45+
<selector>input[name*=telephone]</selector>
46+
</telephone>
2947
</fields>
3048
</mapping>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
9-
<page name="CheckoutOnepage" mca="checkout" module="Magento_Checkout">
10-
<block name="loginBlock" class="Magento\Checkout\Test\Block\Onepage\Login" locator="[data-role='email-with-possible-login']" strategy="css selector"/>
11-
<block name="shippingBlock" class="Magento\Checkout\Test\Block\Onepage\Shipping" locator="#checkout-step-shipping" strategy="css selector"/>
12-
<block name="shippingMethodBlock" class="Magento\Checkout\Test\Block\Onepage\Shipping\Method" locator="#checkout-step-shipping_method" strategy="css selector"/>
13-
<block name="paymentBlock" class="Magento\Checkout\Test\Block\Onepage\Payment" locator="#checkout-step-payment" strategy="css selector"/>
14-
<block name="reviewBlock" class="Magento\Checkout\Test\Block\Onepage\Review" locator=".opc-block-summary" strategy="css selector"/>
15-
</page>
9+
<page name="CheckoutOnepage" mca="checkout" module="Magento_Checkout">
10+
<block name="loginBlock" class="Magento\Checkout\Test\Block\Onepage\Login" locator="[data-role='email-with-possible-login']" strategy="css selector" />
11+
<block name="shippingBlock" class="Magento\Checkout\Test\Block\Onepage\Shipping" locator="#checkout-step-shipping" strategy="css selector" />
12+
<block name="shippingMethodBlock" class="Magento\Checkout\Test\Block\Onepage\Shipping\Method" locator="#checkout-step-shipping_method" strategy="css selector" />
13+
<block name="paymentBlock" class="Magento\Checkout\Test\Block\Onepage\Payment" locator="#checkout-step-payment" strategy="css selector" />
14+
<block name="reviewBlock" class="Magento\Checkout\Test\Block\Onepage\Review" locator=".opc-block-summary" strategy="css selector" />
15+
<block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".page.messages" strategy="css selector" />
16+
</page>
1617
</config>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class OnePageCheckoutTest extends Scenario
4242
const MVP = 'yes';
4343
const DOMAIN = 'CS';
4444
const TEST_TYPE = 'acceptance_test, 3rd_party_test';
45-
const TO_MAINTAIN = 'yes';
4645
/* end tags */
4746

4847
/**

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,15 @@
99
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="OnePageCheckout within Offline Payment Methods" ticketId="MAGETWO-27485">
1010
<variation name="OnePageCheckoutTestVariation1" summary="Checkout as UK guest with virtual product using coupon for not logged in customers">
1111
<data name="products" xsi:type="string">catalogProductVirtual::default</data>
12-
<data name="salesRule" xsi:type="string">active_sales_rule_with_percent_price_discount_coupon</data>
13-
<data name="customer/dataset" xsi:type="string">default</data>
14-
<data name="billingAddress/dataset" xsi:type="string">UK_address</data>
15-
<data name="checkoutMethod" xsi:type="string">guest</data>
12+
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
13+
<data name="customer/dataset" xsi:type="string">customer_UK_1_default_billing_address</data>
14+
<data name="checkoutMethod" xsi:type="string">login</data>
1615
<data name="prices" xsi:type="array">
1716
<item name="grandTotal" xsi:type="string">5.00</item>
1817
</data>
1918
<data name="payment/method" xsi:type="string">checkmo</data>
2019
<data name="status" xsi:type="string">Pending</data>
21-
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Notification, Hold, Invoice, Edit</data>
20+
<data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Invoice, Edit</data>
2221
<data name="configData" xsi:type="string">checkmo_specificcountry_gb</data>
2322
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
2423
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
@@ -29,33 +28,35 @@
2928
<data name="products" xsi:type="string">catalogProductSimple::default</data>
3029
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
3130
<data name="customer/dataset" xsi:type="string">default</data>
32-
<data name="billingAddress/dataset" xsi:type="string">US_address_1</data>
3331
<data name="checkoutMethod" xsi:type="string">guest</data>
32+
<data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
3433
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
3534
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
3635
<data name="prices" xsi:type="array">
3736
<item name="grandTotal" xsi:type="string">285.00</item>
3837
</data>
3938
<data name="payment/method" xsi:type="string">banktransfer</data>
4039
<data name="status" xsi:type="string">Pending</data>
41-
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Notification, Hold, Reorder, Invoice, Edit</data>
40+
<data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Ship, Invoice, Edit</data>
4241
<data name="configData" xsi:type="string">banktransfer</data>
4342
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
4443
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
4544
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
4645
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
4746
</variation>
48-
<variation name="OnePageCheckoutTestVariation3" summary="Checkout as UK guest with virtual product">
49-
<data name="products" xsi:type="string">catalogProductVirtual::default</data>
47+
<variation name="OnePageCheckoutTestVariation3" summary="Checkout as UK guest with simple product">
48+
<data name="products" xsi:type="string">catalogProductSimple::default</data>
5049
<data name="customer/dataset" xsi:type="string">default</data>
51-
<data name="billingAddress/dataset" xsi:type="string">UK_address</data>
5250
<data name="checkoutMethod" xsi:type="string">guest</data>
51+
<data name="shippingAddress/dataset" xsi:type="string">UK_address</data>
52+
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
53+
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
5354
<data name="prices" xsi:type="array">
54-
<item name="grandTotal" xsi:type="string">10.00</item>
55+
<item name="grandTotal" xsi:type="string">565.00</item>
5556
</data>
5657
<data name="payment/method" xsi:type="string">banktransfer</data>
5758
<data name="status" xsi:type="string">Pending</data>
58-
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Notification, Hold, Invoice, Edit</data>
59+
<data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Ship, Invoice, Edit</data>
5960
<data name="configData" xsi:type="string">banktransfer_specificcountry_gb</data>
6061
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
6162
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
@@ -65,8 +66,8 @@
6566
<variation name="OnePageCheckoutTestVariation4" summary="One Page Checkout Products with Special Prices" ticketId="MAGETWO-12429">
6667
<data name="products" xsi:type="string">catalogProductSimple::product_with_special_price, configurableProduct::product_with_special_price</data>
6768
<data name="customer/dataset" xsi:type="string">default</data>
68-
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
6969
<data name="checkoutMethod" xsi:type="string">login</data>
70+
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
7071
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
7172
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
7273
<data name="prices" xsi:type="array">
@@ -85,8 +86,8 @@
8586
<variation name="OnePageCheckoutTestVariation5" summary="Guest Checkout using Check/Money Order and Free Shipping with Prices/Taxes Verifications" ticketId="MAGETWO-12412">
8687
<data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
8788
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
88-
<data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
8989
<data name="checkoutMethod" xsi:type="string">guest</data>
90+
<data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
9091
<data name="shipping/shipping_service" xsi:type="string">Free Shipping</data>
9192
<data name="shipping/shipping_method" xsi:type="string">Free</data>
9293
<data name="prices" xsi:type="array">

0 commit comments

Comments
 (0)