Skip to content

Commit

Permalink
Merge pull request #950 from magento-epam/PR-5
Browse files Browse the repository at this point in the history
[Epam] Extend functional test sprint 5
  • Loading branch information
Yaroslav Onischenko authored Mar 24, 2017
2 parents ed9edb1 + 737a662 commit 8c4bc8d
Show file tree
Hide file tree
Showing 32 changed files with 1,191 additions and 155 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<item name="import_multiple_value_separator" xsi:type="string">,</item>
<item name="import_file" xsi:type="array">
<item name="entities" xsi:type="array">
<item name="0" xsi:type="string">catalogProductSimple::default</item>
<item name="0" xsi:type="string">catalogProductSimple::johndoe_with_addresses</item>
</item>
<item name="template" xsi:type="array">
<item name="filename" xsi:type="string">Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_price_variation_1</item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@
</arguments>
</type>

<type name="Magento\Mtf\Util\Command\File\ExportInterface">
<virtualType name="Magento\Mtf\Util\Command\File\AdvancedPricingExport" type="Magento\Mtf\Util\Command\File\Export">
<arguments>
<argument name="type" xsi:type="string">advancedPricing</argument>
</arguments>
</virtualType>

<type name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertExportAdvancedPricing">
<arguments>
<argument name="export" xsi:type="object">Magento\Mtf\Util\Command\File\AdvancedPricingExport</argument>
</arguments>
</type>

<virtualType name="Magento\Mtf\Util\Command\File\Export\AdvancedPricingReader" type="Magento\Mtf\Util\Command\File\Export\Reader">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class AssertAdminLoginPageIsAvailable extends AbstractConstraint
*/
public function processAssert(AdminAuthLogin $adminAuthLogin)
{
$adminAuthLogin->open();
\PHPUnit_Framework_Assert::assertTrue(
$adminAuthLogin->getLoginBlock()->isVisible(),
'Admin session does not expire properly.'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
<item name="value" xsi:type="number">3600</item>
</field>
</dataset>

<dataset name="admin_session_lifetime_60_seconds">
<field name="admin/security/session_lifetime" xsi:type="array">
<item name="scope" xsi:type="string">default</item>
Expand All @@ -133,6 +134,29 @@
</field>
</dataset>

<dataset name="admin_session_lifetime_60_seconds_rollback">
<field name="admin/security/session_lifetime" xsi:type="array">
<item name="scope" xsi:type="string">default</item>
<item name="scope_id" xsi:type="number">0</item>
<item name="label" xsi:type="number">3600</item>
<item name="value" xsi:type="number">3600</item>
</field>
</dataset>

<dataset name="default_cookie_lifetime_60_seconds">
<field name="web/cookie/cookie_lifetime" xsi:type="array">
<item name="label" xsi:type="string"/>
<item name="value" xsi:type="number">60</item>
</field>
</dataset>

<dataset name="default_cookie_lifetime_60_seconds_rollback">
<field name="web/cookie/cookie_lifetime" xsi:type="array">
<item name="label" xsi:type="string"/>
<item name="value" xsi:type="number">3600</item>
</field>
</dataset>

<dataset name="admin_account_sharing_enable">
<field name="admin/security/admin_account_sharing" xsi:type="array">
<item name="scope" xsi:type="string">default</item>
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?php
/**
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\Backend\Test\TestCase;

use Magento\Customer\Test\Fixture\Customer;
use Magento\Mtf\TestStep\TestStepFactory;
use Magento\Mtf\TestCase\Injectable;

/**
* Steps:
*
* 1. Login to Admin.
* 2. Create customer if needed.
* 3. Apply configuration settings.
* 4. Wait for session to expire.
* 5. Perform asserts.
* 6. Restore default configuration settings.
*
* @ZephyrId MAGETWO-47722, MAGETWO-47723
*/
class ExpireSessionTest extends Injectable
{
/* tags */
const MVP = 'no';
/* end tags */

/**
* Configuration data.
*
* @var string
*/
private $configData;

/**
* Factory for Test Steps.
*
* @var TestStepFactory
*/
private $stepFactory;

/**
* Injection data.
*
* @param TestStepFactory $stepFactory
* @return void
*/
public function __inject(TestStepFactory $stepFactory)
{
$this->stepFactory = $stepFactory;
}

/**
* Runs test.
*
* @param int $sessionLifetimeInSeconds
* @param string $configData
* @param Customer|null $customer
* @return void
*/
public function test(
$sessionLifetimeInSeconds,
$configData,
Customer $customer = null
) {
$this->configData = $configData;
$this->stepFactory->create(
\Magento\Config\Test\TestStep\SetupConfigurationStep::class,
['configData' => $this->configData]
)->run();

if ($customer != null) {
$customer->persist();
$this->stepFactory->create(
\Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class,
['customer' => $customer]
)->run();
}

/**
* Wait admin session to expire.
*/
sleep($sessionLifetimeInSeconds);
}

/**
* Restore default configuration settings.
*
* @return void
*/
public function tearDown()
{
$this->stepFactory->create(
\Magento\Config\Test\TestStep\SetupConfigurationStep::class,
['configData' => $this->configData, 'rollback' => true]
)->run();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Backend\Test\TestCase\ExpireSessionTest" summary="Admin Session Expire" ticketId="MAGETWO-47723">
<variation name="ExpireSessionTestVariation1" summary="Check that session expires according with time settings applied in configuration" ticketId="MAGETWO-47722">
<data name="configData" xsi:type="string">default_cookie_lifetime_60_seconds</data>
<data name="customer/dataset" xsi:type="string">default</data>
<data name="sessionLifetimeInSeconds" xsi:type="number">60</data>
<constraint name="Magento\Cms\Test\Constraint\AssertAuthorizationLinkIsVisibleOnStoreFront" />
</variation>
<variation name="ExpireAdminSession" summary="Expire Admin Session" ticketId="MAGETWO-47723">
<data name="configData" xsi:type="string">admin_session_lifetime_60_seconds</data>
<data name="sessionLifetimeInSeconds" xsi:type="number">60</data>
<constraint name="Magento\Backend\Test\Constraint\AssertAdminLoginPageIsAvailable" />
</variation>
</testCase>
</config>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" ?>
<!--
/**
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<mapping strict="0">
<fields>
<captcha>
<selector>[name='captcha[user_edit]']</selector>
</captcha>
</fields>
</mapping>
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,50 @@
</field>
</dataset>

<dataset name="captcha_storefront_user_edit_failures_number">
<field name="customer/captcha/enable" xsi:type="array">
<item name="scope_id" xsi:type="number">0</item>
<item name="label" xsi:type="string">Yes</item>
<item name="value" xsi:type="number">1</item>
</field>
<field name="customer/captcha/forms" xsi:type="array">
<item name="scope_id" xsi:type="number">0</item>
<item name="label" xsi:type="string">Change password</item>
<item name="value" xsi:type="string">user_edit</item>
</field>
<field name="customer/captcha/mode" xsi:type="array">
<item name="scope_id" xsi:type="number">0</item>
<item name="label" xsi:type="string">After number of attempts to login</item>
<item name="value" xsi:type="string">after_fail</item>
</field>
<field name="customer/captcha/failed_attempts_login" xsi:type="array">
<item name="scope" xsi:type="string">customer</item>
<item name="scope_id" xsi:type="number">1</item>
<item name="label" xsi:type="string"/>
<item name="value" xsi:type="string">3</item>
</field>
<field name="customer/captcha/length" xsi:type="array">
<item name="scope" xsi:type="string">customer</item>
<item name="scope_id" xsi:type="number">1</item>
<item name="label" xsi:type="string"/>
<item name="value" xsi:type="number">3</item>
</field>
<field name="customer/captcha/symbols" xsi:type="array">
<item name="scope" xsi:type="string">customer</item>
<item name="scope_id" xsi:type="number">1</item>
<item name="label" xsi:type="string"/>
<item name="value" xsi:type="number">1</item>
</field>
</dataset>
<dataset name="captcha_storefront_user_edit_failures_number_rollback">
<field name="customer/captcha/enable" xsi:type="array">
<item name="scope" xsi:type="string">default</item>
<item name="scope_id" xsi:type="number">1</item>
<item name="label" xsi:type="string">No</item>
<item name="value" xsi:type="number">0</item>
</field>
</dataset>

<dataset name="captcha_backend_login">
<field name="admin/captcha/enable" xsi:type="array">
<item name="scope_id" xsi:type="number">0</item>
Expand Down
Loading

0 comments on commit 8c4bc8d

Please sign in to comment.