Merge remote-tracking branch 'origin/MAGETWO-50160-fix-functional-test' into ext_pr

Dale Sikkema · Dale Sikkema · commit bfdcc6d41858 · 2016-03-11T10:43:25.000-06:00
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/DropdownmultiselectElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DropdownmultiselectElement.php
@@ -32,7 +32,7 @@ class DropdownmultiselectElement extends MultiselectElement
      *
      * @var string
      */
-    protected $optionByValue = './/li[label[contains(normalize-space(.), %s)]]';
+    protected $optionByValue = './/li//label[contains(normalize-space(.), %s)]';
 
     /**
      * Set values.
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Backend\Test\TestCase;
 
 use Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit;
+use Magento\Backend\Test\Page\AdminAuthLogin;
 use Magento\Config\Test\Fixture\ConfigData;
 use Magento\Mtf\TestCase\Injectable;
 
@@ -46,10 +47,14 @@ class ExpireAdminSessionTest extends Injectable
      *
      * @param SystemConfigEdit $systemConfigEdit
      * @param ConfigData $sessionLifetimeConfig
+     * @param AdminAuthLogin $adminAuthLogin
      * @return void
      */
-    public function test(SystemConfigEdit $systemConfigEdit, ConfigData $sessionLifetimeConfig)
-    {
+    public function test(
+        SystemConfigEdit $systemConfigEdit,
+        ConfigData $sessionLifetimeConfig,
+        AdminAuthLogin $adminAuthLogin
+    ) {
         $this->systemConfigEdit = $systemConfigEdit;
         $this->sessionLifetimeConfig = $sessionLifetimeConfig;
         $this->systemConfigEdit->open();
@@ -71,7 +76,7 @@ public function test(SystemConfigEdit $systemConfigEdit, ConfigData $sessionLife
          */
         sleep($section[$keys[0]]['label']);
 
-        $this->systemConfigEdit->open();
+        $adminAuthLogin->open();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
@@ -14,7 +14,7 @@
         </variation>
         <variation name="NavigateMenuTest10">
             <data name="menuItem" xsi:type="string">Products > Categories</data>
-            <data name="pageTitle" xsi:type="string">Categories</data>
+            <data name="pageTitle" xsi:type="string">Default Category</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest11">
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Block/Edit/CmsForm.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Block/Edit/CmsForm.xml
@@ -12,7 +12,8 @@
             <input>multiselectgrouplist</input>
         </stores>
         <is_active>
-            <input>checkbox</input>
+            <selector>.admin__actions-switch-label</selector>
+            <input>switcher</input>
         </is_active>
     </fields>
 </mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.xml
@@ -13,7 +13,8 @@
         <fields>
             <title />
             <is_active>
-                <input>checkbox</input>
+                <selector>.admin__actions-switch-label</selector>
+                <input>switcher</input>
             </is_active>
         </fields>
     </page_information>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/Tab/Content.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/Tab/Content.php
@@ -59,6 +59,13 @@ class Content extends Tab
      */
     protected $contentHeading = '[name="content_heading"]';
 
+    /**
+     * Header locator.
+     *
+     * @var string
+     */
+    protected $header = 'header.page-header';
+
     /**
      * Clicking in content tab 'Insert Variable' button.
      *
@@ -85,7 +92,12 @@ public function clickInsertWidget(SimpleElement $element = null)
         $context = $element === null ? $this->_rootElement : $element;
         $addWidgetButton = $context->find($this->addWidgetButton);
         if ($addWidgetButton->isVisible()) {
-            $addWidgetButton->click();
+            try {
+                $addWidgetButton->click();
+            } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+                $this->browser->find($this->header)->hover();
+                $addWidgetButton->click();
+            }
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php
@@ -29,6 +29,7 @@ public function processAssert(CmsBlock $cmsBlock, CmsBlockIndex $cmsBlockIndex)
     {
         $cmsBlockIndex->open();
         $data = $cmsBlock->getData();
+        $data['is_active'] = $data['is_active'] == 'Yes' ?  'Enabled' : 'Disabled';
         if (isset($data['stores'])) {
             $storeId = is_array($data['stores']) ? reset($data['stores']) : $data['stores'];
             $parts = explode("/", $storeId);
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
@@ -30,6 +30,20 @@ class Register extends Form
      */
     protected $customerAttribute = "[name='%s']";
 
+    /**
+     * Locator for password error
+     *
+     * @var string
+     */
+    protected $passwordError = "#password-error";
+
+    /**
+     * Locator for password confirmation error
+     *
+     * @var string
+     */
+    protected $passwordConfirmationError = "#password-confirmation-error";
+
     /**
      * Create new customer account and fill billing address if it exists
      *
@@ -44,4 +58,26 @@ public function registerCustomer(FixtureInterface $fixture, $address = null)
         }
         $this->_rootElement->find($this->submit, Locator::SELECTOR_CSS)->click();
     }
+
+    /**
+     * Get password error on new customer registration form.
+     *
+     * @return string
+     *
+     */
+    public function getPasswordError()
+    {
+        return $this->_rootElement->find($this->passwordError, Locator::SELECTOR_CSS)->getText();
+    }
+
+    /**
+     * Get password confirmation error on new customer registration form.
+     *
+     * @return string
+     *
+     */
+    public function getPasswordConfirmationError()
+    {
+        return $this->_rootElement->find($this->passwordConfirmationError, Locator::SELECTOR_CSS)->getText();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml
@@ -11,8 +11,8 @@
             <data name="customer/data/firstname" xsi:type="string">john</data>
             <data name="customer/data/lastname" xsi:type="string">doe</data>
             <data name="customer/data/email" xsi:type="string">johndoe%isolation%@example.com</data>
-            <data name="customer/data/password" xsi:type="string">123123q</data>
-            <data name="customer/data/password_confirmation" xsi:type="string">123123q</data>
+            <data name="customer/data/password" xsi:type="string">123123q#</data>
+            <data name="customer/data/password_confirmation" xsi:type="string">123123q#</data>
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerFailRegisterMessage" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml
@@ -41,23 +41,5 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerSuccessRegisterMessage" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerRedirectToDashboard" />
         </variation>
-        <variation name="RegisterCustomerFrontendEntityTestVariation4" summary="Customer password length is below 8 characters">
-            <data name="customer/data/firstname" xsi:type="string">john</data>
-            <data name="customer/data/lastname" xsi:type="string">doe</data>
-            <data name="customer/data/email" xsi:type="string">johndoe%isolation%@example.com</data>
-            <data name="customer/data/is_subscribed" xsi:type="string">No</data>
-            <data name="customer/data/password" xsi:type="string">123123q</data>
-            <data name="customer/data/password_confirmation" xsi:type="string">123123q</data>
-            <constraint name="Magento\Customer\Test\Constraint\AssertPasswordLengthErrorMessage" />
-        </variation>
-        <variation name="RegisterCustomerFrontendEntityTestVariation5" summary="Customer password is not secure enough">
-            <data name="customer/data/firstname" xsi:type="string">john</data>
-            <data name="customer/data/lastname" xsi:type="string">doe</data>
-            <data name="customer/data/email" xsi:type="string">johndoe%isolation%@example.com</data>
-            <data name="customer/data/is_subscribed" xsi:type="string">No</data>
-            <data name="customer/data/password" xsi:type="string">123123qw</data>
-            <data name="customer/data/password_confirmation" xsi:type="string">123123qw</data>
-            <constraint name="Magento\Customer\Test\Constraint\AssertPasswordIsNotSecureEnoughMessage" />
-        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordIsNotSecureEnoughMessage.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordIsNotSecureEnoughMessage.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Customer\Test\Constraint;
+namespace Magento\Security\Test\Constraint;
 
 use Magento\Customer\Test\Page\CustomerAccountCreate;
 use Magento\Mtf\Constraint\AbstractConstraint;
@@ -23,9 +23,9 @@ class AssertPasswordIsNotSecureEnoughMessage extends AbstractConstraint
      */
     public function processAssert(CustomerAccountCreate $registerPage)
     {
-        $expectedErrorMessage = 'Minimum different classes of characters in password are 3.' .
+        $expectedErrorMessage = 'Minimum of different classes of characters in password is 3.' .
             ' Classes of characters: Lower Case, Upper Case, Digits, Special Characters.';
-        $errorMessage = $registerPage->getMessagesBlock()->getErrorMessage();
+        $errorMessage = $registerPage->getRegisterForm()->getPasswordError();
         \PHPUnit_Framework_Assert::assertEquals(
             $expectedErrorMessage,
             $errorMessage,
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordLengthErrorMessage.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordLengthErrorMessage.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Customer\Test\Constraint;
+namespace Magento\Security\Test\Constraint;
 
 use Magento\Customer\Test\Page\CustomerAccountCreate;
 use Magento\Mtf\Constraint\AbstractConstraint;
@@ -14,7 +14,7 @@
  */
 class AssertPasswordLengthErrorMessage extends AbstractConstraint
 {
-    const PASSWORD_LENGTH_ERROR_MESSAGE = 'Please enter a password with at least 8 characters.';
+    const PASSWORD_LENGTH_ERROR_MESSAGE = 'Minimum length of this field must be equal or greater than 8 symbols';
 
     /**
      * Assert that appropriate message is displayed on "Create New Customer Account" page(frontend) if password length
@@ -25,11 +25,11 @@ class AssertPasswordLengthErrorMessage extends AbstractConstraint
      */
     public function processAssert(CustomerAccountCreate $registerPage)
     {
-        $errorMessage = $registerPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        $errorMessage = $registerPage->getRegisterForm()->getPasswordError();
+        \PHPUnit_Framework_Assert::assertContains(
             self::PASSWORD_LENGTH_ERROR_MESSAGE,
             $errorMessage,
-            'The messages are not equal.'
+            'Incorrect password error message.'
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Page/UserAccountForgotPassword.php b/dev/tests/functional/tests/app/Magento/Security/Test/Page/UserAccountForgotPassword.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Security\Test\Page;
+
+use Magento\Mtf\Page\Page;
+
+/**
+ * Class UserAccountForgotPassword
+ */
+class UserAccountForgotPassword extends Page
+{
+    const MCA = 'admin/auth/forgotpassword';
+
+    /**
+     * Blocks' config
+     *
+     * @var array
+     */
+    protected $blocks = [
+        'messagesBlock' => [
+            'class' => 'Magento\Backend\Test\Block\Messages',
+            'locator' => '.messages',
+            'strategy' => 'css selector',
+        ],
+        'forgotPasswordForm' => [
+            'class' => 'Magento\Security\Test\Block\Form\ForgotPassword',
+            'locator' => '#login-form',
+            'strategy' => 'css selector',
+        ],
+    ];
+
+    /**
+     * Constructor.
+     */
+    protected function initUrl()
+    {
+        $this->url = $_ENV['app_backend_url'] . self::MCA;
+    }
+
+    /**
+     * @return \Magento\Backend\Test\Block\Messages
+     */
+    public function getMessagesBlock()
+    {
+        return $this->getBlockInstance('messagesBlock');
+    }
+
+    /**
+     * @return \Magento\Security\Test\Block\Form\ForgotPassword
+     */
+    public function getForgotPasswordForm()
+    {
+        return $this->getBlockInstance('forgotPasswordForm');
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Page/UserAccountForgotPassword.xml b/dev/tests/functional/tests/app/Magento/Security/Test/Page/UserAccountForgotPassword.xml
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewFrontendCustomerPasswordTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewFrontendCustomerPasswordTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Security\Test\TestCase;
+
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Customer\Test\Page\CustomerAccountCreate;
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Mtf\TestCase\Injectable;
+
+/**
+ * Test Flow:
+ * 1. Go to frontend.
+ * 2. Click Register link.
+ * 3. Fill registry form.
+ * 4. Click 'Create account' button.
+ * 5. Perform assertions.
+ *
+ * @ZephyrId MAGETWO-49044
+ */
+class NewFrontendCustomerPasswordTest extends Injectable
+{
+    /* tags */
+    const MVP = 'yes';
+    const DOMAIN = 'PS';
+    /* end tags */
+
+    /**
+     * Customer registry page.
+     *
+     * @var CustomerAccountCreate
+     */
+    protected $customerAccountCreate;
+
+    /**
+     * Cms page.
+     *
+     * @var CmsIndex $cmsIndex
+     */
+    protected $cmsIndex;
+
+    /**
+     * Inject data.
+     *
+     * @param CustomerAccountCreate $customerAccountCreate
+     * @param CmsIndex $cmsIndex
+     * @return void
+     */
+    public function __inject(
+        CustomerAccountCreate $customerAccountCreate,
+        CmsIndex $cmsIndex
+    ) {
+        $this->customerAccountCreate = $customerAccountCreate;
+        $this->cmsIndex = $cmsIndex;
+    }
+
+    /**
+     * Create Customer account on Storefront.
+     *
+     * @param Customer $customer
+     * @return void
+     */
+    public function test(Customer $customer)
+    {
+        // Steps
+        $this->cmsIndex->open();
+        $this->cmsIndex->getLinksBlock()->openLink('Create an Account');
+        $this->customerAccountCreate->getRegisterForm()->registerCustomer($customer);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewFrontendCustomerPasswordTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewFrontendCustomerPasswordTest.xml

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class DropdownmultiselectElement extends MultiselectElement`
`32`	`32`	`*`
`33`	`33`	`* @var string`
`34`	`34`	`*/`
`35`		`- protected $optionByValue = './/li[label[contains(normalize-space(.), %s)]]';`
	`35`	`+ protected $optionByValue = './/li//label[contains(normalize-space(.), %s)]';`
`36`	`36`
`37`	`37`	`/**`
`38`	`38`	`* Set values.`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public function processAssert(CmsBlock $cmsBlock, CmsBlockIndex $cmsBlockIndex)`
`29`	`29`	`{`
`30`	`30`	`$cmsBlockIndex->open();`
`31`	`31`	`$data = $cmsBlock->getData();`
	`32`	`+ $data['is_active'] = $data['is_active'] == 'Yes' ? 'Enabled' : 'Disabled';`
`32`	`33`	`if (isset($data['stores'])) {`
`33`	`34`	`$storeId = is_array($data['stores']) ? reset($data['stores']) : $data['stores'];`
`34`	`35`	`$parts = explode("/", $storeId);`