Skip to content

Commit f7a054b

Browse files
author
Volodymyr Kublytskyi
committed
Merge mainline into api-coverage
2 parents 44e2de8 + 8c4bc8d commit f7a054b

32 files changed

+1191
-155
lines changed

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<item name="import_multiple_value_separator" xsi:type="string">,</item>
1919
<item name="import_file" xsi:type="array">
2020
<item name="entities" xsi:type="array">
21-
<item name="0" xsi:type="string">catalogProductSimple::default</item>
21+
<item name="0" xsi:type="string">catalogProductSimple::johndoe_with_addresses</item>
2222
</item>
2323
<item name="template" xsi:type="array">
2424
<item name="filename" xsi:type="string">Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_price_variation_1</item>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,16 @@
1313
</arguments>
1414
</type>
1515

16-
<type name="Magento\Mtf\Util\Command\File\ExportInterface">
16+
<virtualType name="Magento\Mtf\Util\Command\File\AdvancedPricingExport" type="Magento\Mtf\Util\Command\File\Export">
1717
<arguments>
1818
<argument name="type" xsi:type="string">advancedPricing</argument>
1919
</arguments>
20+
</virtualType>
21+
22+
<type name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertExportAdvancedPricing">
23+
<arguments>
24+
<argument name="export" xsi:type="object">Magento\Mtf\Util\Command\File\AdvancedPricingExport</argument>
25+
</arguments>
2026
</type>
2127

2228
<virtualType name="Magento\Mtf\Util\Command\File\Export\AdvancedPricingReader" type="Magento\Mtf\Util\Command\File\Export\Reader">

‎dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertAdminLoginPageIsAvailable.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class AssertAdminLoginPageIsAvailable extends AbstractConstraint
2222
*/
2323
public function processAssert(AdminAuthLogin $adminAuthLogin)
2424
{
25+
$adminAuthLogin->open();
2526
\PHPUnit_Framework_Assert::assertTrue(
2627
$adminAuthLogin->getLoginBlock()->isVisible(),
2728
'Admin session does not expire properly.'

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
<item name="value" xsi:type="number">3600</item>
125125
</field>
126126
</dataset>
127+
127128
<dataset name="admin_session_lifetime_60_seconds">
128129
<field name="admin/security/session_lifetime" xsi:type="array">
129130
<item name="scope" xsi:type="string">default</item>
@@ -133,6 +134,29 @@
133134
</field>
134135
</dataset>
135136

137+
<dataset name="admin_session_lifetime_60_seconds_rollback">
138+
<field name="admin/security/session_lifetime" xsi:type="array">
139+
<item name="scope" xsi:type="string">default</item>
140+
<item name="scope_id" xsi:type="number">0</item>
141+
<item name="label" xsi:type="number">3600</item>
142+
<item name="value" xsi:type="number">3600</item>
143+
</field>
144+
</dataset>
145+
146+
<dataset name="default_cookie_lifetime_60_seconds">
147+
<field name="web/cookie/cookie_lifetime" xsi:type="array">
148+
<item name="label" xsi:type="string"/>
149+
<item name="value" xsi:type="number">60</item>
150+
</field>
151+
</dataset>
152+
153+
<dataset name="default_cookie_lifetime_60_seconds_rollback">
154+
<field name="web/cookie/cookie_lifetime" xsi:type="array">
155+
<item name="label" xsi:type="string"/>
156+
<item name="value" xsi:type="number">3600</item>
157+
</field>
158+
</dataset>
159+
136160
<dataset name="admin_account_sharing_enable">
137161
<field name="admin/security/admin_account_sharing" xsi:type="array">
138162
<item name="scope" xsi:type="string">default</item>

‎dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireAdminSessionTest.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireSessionTest.php

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?php
2+
/**
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Backend\Test\TestCase;
8+
9+
use Magento\Customer\Test\Fixture\Customer;
10+
use Magento\Mtf\TestStep\TestStepFactory;
11+
use Magento\Mtf\TestCase\Injectable;
12+
13+
/**
14+
* Steps:
15+
*
16+
* 1. Login to Admin.
17+
* 2. Create customer if needed.
18+
* 3. Apply configuration settings.
19+
* 4. Wait for session to expire.
20+
* 5. Perform asserts.
21+
* 6. Restore default configuration settings.
22+
*
23+
* @ZephyrId MAGETWO-47722, MAGETWO-47723
24+
*/
25+
class ExpireSessionTest extends Injectable
26+
{
27+
/* tags */
28+
const MVP = 'no';
29+
/* end tags */
30+
31+
/**
32+
* Configuration data.
33+
*
34+
* @var string
35+
*/
36+
private $configData;
37+
38+
/**
39+
* Factory for Test Steps.
40+
*
41+
* @var TestStepFactory
42+
*/
43+
private $stepFactory;
44+
45+
/**
46+
* Injection data.
47+
*
48+
* @param TestStepFactory $stepFactory
49+
* @return void
50+
*/
51+
public function __inject(TestStepFactory $stepFactory)
52+
{
53+
$this->stepFactory = $stepFactory;
54+
}
55+
56+
/**
57+
* Runs test.
58+
*
59+
* @param int $sessionLifetimeInSeconds
60+
* @param string $configData
61+
* @param Customer|null $customer
62+
* @return void
63+
*/
64+
public function test(
65+
$sessionLifetimeInSeconds,
66+
$configData,
67+
Customer $customer = null
68+
) {
69+
$this->configData = $configData;
70+
$this->stepFactory->create(
71+
\Magento\Config\Test\TestStep\SetupConfigurationStep::class,
72+
['configData' => $this->configData]
73+
)->run();
74+
75+
if ($customer != null) {
76+
$customer->persist();
77+
$this->stepFactory->create(
78+
\Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class,
79+
['customer' => $customer]
80+
)->run();
81+
}
82+
83+
/**
84+
* Wait admin session to expire.
85+
*/
86+
sleep($sessionLifetimeInSeconds);
87+
}
88+
89+
/**
90+
* Restore default configuration settings.
91+
*
92+
* @return void
93+
*/
94+
public function tearDown()
95+
{
96+
$this->stepFactory->create(
97+
\Magento\Config\Test\TestStep\SetupConfigurationStep::class,
98+
['configData' => $this->configData, 'rollback' => true]
99+
)->run();
100+
}
101+
}

‎dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireSessionTest.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2013-2017 Magento, Inc. 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\Backend\Test\TestCase\ExpireSessionTest" summary="Admin Session Expire" ticketId="MAGETWO-47723">
10+
<variation name="ExpireSessionTestVariation1" summary="Check that session expires according with time settings applied in configuration" ticketId="MAGETWO-47722">
11+
<data name="configData" xsi:type="string">default_cookie_lifetime_60_seconds</data>
12+
<data name="customer/dataset" xsi:type="string">default</data>
13+
<data name="sessionLifetimeInSeconds" xsi:type="number">60</data>
14+
<constraint name="Magento\Cms\Test\Constraint\AssertAuthorizationLinkIsVisibleOnStoreFront" />
15+
</variation>
16+
<variation name="ExpireAdminSession" summary="Expire Admin Session" ticketId="MAGETWO-47723">
17+
<data name="configData" xsi:type="string">admin_session_lifetime_60_seconds</data>
18+
<data name="sessionLifetimeInSeconds" xsi:type="number">60</data>
19+
<constraint name="Magento\Backend\Test\Constraint\AssertAdminLoginPageIsAvailable" />
20+
</variation>
21+
</testCase>
22+
</config>

‎dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/CustomerForm.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
/**
4+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<mapping strict="0">
9+
<fields>
10+
<captcha>
11+
<selector>[name='captcha[user_edit]']</selector>
12+
</captcha>
13+
</fields>
14+
</mapping>

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,50 @@
165165
</field>
166166
</dataset>
167167

168+
<dataset name="captcha_storefront_user_edit_failures_number">
169+
<field name="customer/captcha/enable" xsi:type="array">
170+
<item name="scope_id" xsi:type="number">0</item>
171+
<item name="label" xsi:type="string">Yes</item>
172+
<item name="value" xsi:type="number">1</item>
173+
</field>
174+
<field name="customer/captcha/forms" xsi:type="array">
175+
<item name="scope_id" xsi:type="number">0</item>
176+
<item name="label" xsi:type="string">Change password</item>
177+
<item name="value" xsi:type="string">user_edit</item>
178+
</field>
179+
<field name="customer/captcha/mode" xsi:type="array">
180+
<item name="scope_id" xsi:type="number">0</item>
181+
<item name="label" xsi:type="string">After number of attempts to login</item>
182+
<item name="value" xsi:type="string">after_fail</item>
183+
</field>
184+
<field name="customer/captcha/failed_attempts_login" xsi:type="array">
185+
<item name="scope" xsi:type="string">customer</item>
186+
<item name="scope_id" xsi:type="number">1</item>
187+
<item name="label" xsi:type="string"/>
188+
<item name="value" xsi:type="string">3</item>
189+
</field>
190+
<field name="customer/captcha/length" xsi:type="array">
191+
<item name="scope" xsi:type="string">customer</item>
192+
<item name="scope_id" xsi:type="number">1</item>
193+
<item name="label" xsi:type="string"/>
194+
<item name="value" xsi:type="number">3</item>
195+
</field>
196+
<field name="customer/captcha/symbols" xsi:type="array">
197+
<item name="scope" xsi:type="string">customer</item>
198+
<item name="scope_id" xsi:type="number">1</item>
199+
<item name="label" xsi:type="string"/>
200+
<item name="value" xsi:type="number">1</item>
201+
</field>
202+
</dataset>
203+
<dataset name="captcha_storefront_user_edit_failures_number_rollback">
204+
<field name="customer/captcha/enable" xsi:type="array">
205+
<item name="scope" xsi:type="string">default</item>
206+
<item name="scope_id" xsi:type="number">1</item>
207+
<item name="label" xsi:type="string">No</item>
208+
<item name="value" xsi:type="number">0</item>
209+
</field>
210+
</dataset>
211+
168212
<dataset name="captcha_backend_login">
169213
<field name="admin/captcha/enable" xsi:type="array">
170214
<item name="scope_id" xsi:type="number">0</item>

0 commit comments

Comments
 (0)