Skip to content

Commit d0f1f2c

Browse files
author
Oleksandr Dubovyk
committed
Merge remote-tracking branch 'mainline/develop' into pull-primary
2 parents f32d0b9 + 3a8df23 commit d0f1f2c

File tree

30 files changed

+701
-97
lines changed

30 files changed

+701
-97
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-rc48",
3+
"magento/mtf": "1.0.0-rc49",
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/lib/Magento/Mtf/App/State/State1.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class State1 extends AbstractState
2525
*
2626
* @var string
2727
*/
28-
protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable';
28+
protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable, log_to_file';
2929

3030
/**
3131
* @construct

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<data name="creditCard/dataset" xsi:type="string">visa_authorizenet</data>
2323
<data name="configData" xsi:type="string">authorizenet</data>
2424
<data name="status" xsi:type="string">Processing</data>
25-
<data name="transactionDetails" xsi:type="array">
26-
<item name="isClosed" xsi:type="string">No</item>
27-
<item name="transactionType" xsi:type="string">Authorization</item>
28-
</data>
2925
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
3026
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
3127
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />

‎dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,15 @@
150150
</field>
151151
</dataset>
152152

153+
<dataset name="log_to_file">
154+
<field name="dev/debug/debug_logging" xsi:type="array">
155+
<item name="scope" xsi:type="string">default</item>
156+
<item name="scope_id" xsi:type="number">0</item>
157+
<item name="label" xsi:type="string">Yes</item>
158+
<item name="value" xsi:type="number">1</item>
159+
</field>
160+
</dataset>
161+
153162
<dataset name="enable_https_frontend_admin">
154163
<field name="web/secure/use_in_frontend" xsi:type="array">
155164
<item name="scope" xsi:type="string">default</item>
@@ -164,6 +173,22 @@
164173
<item name="value" xsi:type="number">1</item>
165174
</field>
166175
</dataset>
176+
177+
<dataset name="enable_https_frontend_admin_rollback">
178+
<field name="web/secure/use_in_frontend" xsi:type="array">
179+
<item name="scope" xsi:type="string">default</item>
180+
<item name="scope_id" xsi:type="number">0</item>
181+
<item name="label" xsi:type="string">No</item>
182+
<item name="value" xsi:type="number">0</item>
183+
</field>
184+
<field name="web/secure/use_in_adminhtml" xsi:type="array">
185+
<item name="scope" xsi:type="string">default</item>
186+
<item name="scope_id" xsi:type="number">0</item>
187+
<item name="label" xsi:type="string">No</item>
188+
<item name="value" xsi:type="number">0</item>
189+
</field>
190+
</dataset>
191+
167192
<dataset name="enable_hsts">
168193
<field name="web/secure/enable_hsts" xsi:type="array">
169194
<item name="scope" xsi:type="string">default</item>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<data name="payment/method" xsi:type="string">braintree</data>
2424
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
2525
<data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure</data>
26+
<data name="isVaultEnabled" xsi:type="boolean">false</data>
2627
<data name="configData" xsi:type="string">braintree, braintree_3d_secure_not_triggered_due_threshold</data>
2728
<data name="status" xsi:type="string">Processing</data>
2829
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
@@ -46,6 +47,7 @@
4647
<data name="payment/method" xsi:type="string">braintree</data>
4748
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
4849
<data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure</data>
50+
<data name="isVaultEnabled" xsi:type="boolean">false</data>
4951
<data name="configData" xsi:type="string">braintree, braintree_3d_secure_uk</data>
5052
<data name="status" xsi:type="string">Processing</data>
5153
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
@@ -69,6 +71,7 @@
6971
<data name="payment/method" xsi:type="string">braintree</data>
7072
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
7173
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
74+
<data name="isVaultEnabled" xsi:type="boolean">false</data>
7275
<data name="configData" xsi:type="string">braintree</data>
7376
<data name="status" xsi:type="string">Processing</data>
7477
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test, severity:S0</data>
@@ -96,6 +99,7 @@
9699
<data name="payment/method" xsi:type="string">braintree</data>
97100
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
98101
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
102+
<data name="isVaultEnabled" xsi:type="boolean">false</data>
99103
<data name="configData" xsi:type="string">braintree, braintree_sale</data>
100104
<data name="status" xsi:type="string">Processing</data>
101105
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106
<step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
107107
<step name="fillBillingInformation" module="Magento_Checkout" next="placeOrderWithPaypal" />
108108
<step name="placeOrderWithPaypal" module="Magento_Braintree" next="createInvoice" />
109-
<step name="createInvoice" module="Magento_Sales" next="createBraintreeCreditMemo" />
110-
<step name="createBraintreeCreditMemo" module="Magento_Braintree" />
109+
<step name="createInvoice" module="Magento_Sales" next="createOnlineCreditMemo" />
110+
<step name="createOnlineCreditMemo" module="Magento_Sales" />
111111
</scenario>
112112
<scenario name="SaveUseDeleteVaultForPaypalBraintreeTest" firstStep="setupConfiguration">
113113
<step name="setupConfiguration" module="Magento_Config" next="createProducts" />

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ class Method extends Block
3535
*/
3636
protected $billingAddressSelector = '.payment-method-billing-address';
3737

38-
/**
39-
* Save credit card check box.
40-
*
41-
* @var string
42-
*/
43-
protected $vaultCheckbox = '#%s_enable_vault';
44-
4538
/**
4639
* PayPal load spinner.
4740
*
@@ -137,17 +130,4 @@ public function getBillingBlock()
137130
['element' => $element]
138131
);
139132
}
140-
141-
/**
142-
* Save credit card.
143-
*
144-
* @param string $paymentMethod
145-
* @param string $creditCardSave
146-
* @return void
147-
*/
148-
public function saveCreditCard($paymentMethod, $creditCardSave)
149-
{
150-
$saveCard = sprintf($this->vaultCheckbox, $paymentMethod);
151-
$this->_rootElement->find($saveCard, Locator::SELECTOR_CSS, 'checkbox')->setValue($creditCardSave);
152-
}
153133
}

‎dev/tests/functional/tests/app/Magento/Checkout/Test/etc/di.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9-
<type name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty">
10-
<arguments>
11-
<argument name="severity" xsi:type="string">middle</argument>
12-
</arguments>
13-
</type>
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
10+
<type name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty">
11+
<arguments>
12+
<argument name="severity" xsi:type="string">middle</argument>
13+
</arguments>
14+
</type>
15+
<type name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage">
16+
<arguments>
17+
<argument name="severity" xsi:type="string">S0</argument>
18+
</arguments>
19+
</type>
1420
</config>

‎dev/tests/functional/tests/app/Magento/Config/Test/TestStep/SetupConfigurationStep.php

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
use Magento\Mtf\Fixture\FixtureFactory;
1010
use Magento\Mtf\TestStep\TestStepInterface;
11+
use Magento\Mtf\Util\Command\Cli\Cache;
1112
use Magento\PageCache\Test\Page\Adminhtml\AdminCache;
1213

1314
/**
@@ -50,19 +51,28 @@ class SetupConfigurationStep implements TestStepInterface
5051
*/
5152
protected $flushCache;
5253

54+
/**
55+
* Cli command to do operations with cache.
56+
*
57+
* @var Cache
58+
*/
59+
private $cache;
60+
5361
/**
5462
* Preparing step properties.
5563
*
5664
* @constructor
5765
* @param FixtureFactory $fixtureFactory
5866
* @param AdminCache $adminCache
67+
* @param Cache $cache
5968
* @param string $configData
6069
* @param bool $rollback
6170
* @param bool $flushCache
6271
*/
6372
public function __construct(
6473
FixtureFactory $fixtureFactory,
6574
AdminCache $adminCache,
75+
Cache $cache,
6676
$configData = null,
6777
$rollback = false,
6878
$flushCache = false
@@ -72,6 +82,7 @@ public function __construct(
7282
$this->configData = $configData;
7383
$this->rollback = $rollback;
7484
$this->flushCache = $flushCache;
85+
$this->cache = $cache;
7586
}
7687

7788
/**
@@ -95,13 +106,11 @@ public function run()
95106
$config->persist();
96107
$result[] = $config;
97108
}
109+
if ($this->flushCache) {
110+
$this->cache->flush();
111+
}
98112
}
99-
100-
if ($this->flushCache) {
101-
$this->adminCache->open();
102-
$this->adminCache->getActionsBlock()->flushMagentoCache();
103-
$this->adminCache->getMessagesBlock()->waitSuccessMessage();
104-
}
113+
105114

106115
return ['config' => $result];
107116
}

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2016 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\Checkout\Test\TestCase\OnePageCheckoutTest" summary="Guest Checkout with PayPal Payflow Pro credit card">
10+
<variation name="OnePageCheckoutPayflowProVariation1" summary="Guest Checkout with PayPal Payflow Pro credit card" ticketId="MAGETWO-60583">
11+
<data name="products/0" 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</data>
14+
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
15+
<data name="checkoutMethod" xsi:type="string">guest</data>
16+
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
17+
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
18+
<data name="payment/method" xsi:type="string">payflowpro</data>
19+
<data name="prices" xsi:type="array">
20+
<item name="grandTotal" xsi:type="string">15.83</item>
21+
</data>
22+
<data name="creditCardClass" xsi:type="string">credit_card</data>
23+
<data name="creditCard/dataset" xsi:type="string">visa_default</data>
24+
<data name="isVaultEnabled" xsi:type="boolean">false</data>
25+
<data name="configData" xsi:type="string">payflowpro</data>
26+
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
27+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
28+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
29+
<constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
30+
</variation>
31+
</testCase>
32+
</config>

0 commit comments

Comments
 (0)