Merge branch 'MTA-2496' of https://github.corp.ebay.com/magento-qmt/magento2ce into develop

Dmytro Aponasenko · Dmytro Aponasenko · commit 62a557714306 · 2015-10-05T11:41:38.000Z
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLogout.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLogout.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Test\Constraint;
+
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Customer\Test\Page\CustomerAccountIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that customer success log out.
+ */
+class AssertCustomerLogout extends AbstractConstraint
+{
+    /**
+     * Logout page title.
+     */
+    const LOGOUT_PAGE_TITLE = 'You are signed out';
+
+    /**
+     * Home page title.
+     */
+    const HOME_PAGE_TITLE = 'Home Page';
+
+    /**
+     * Assert that customer success log out.
+     *
+     * @param CustomerAccountIndex $customerAccountIndex
+     * @param CmsIndex $cmsIndex
+     * @return void
+     */
+    public function processAssert(CustomerAccountIndex $customerAccountIndex, CmsIndex $cmsIndex)
+    {
+        $customerAccountIndex->open();
+        $cmsIndex->getCmsPageBlock()->waitPageInit();
+
+        $cmsIndex->getLinksBlock()->openLink('Sign Out');
+        $cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible(self::LOGOUT_PAGE_TITLE);
+        $cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible(self::HOME_PAGE_TITLE);
+        $cmsIndex->getCmsPageBlock()->waitPageInit();
+        \PHPUnit_Framework_Assert::assertTrue(
+            $cmsIndex->getLinksBlock()->isLinkVisible('Sign In'),
+            "Customer wasn't logged out."
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return "Customer is successfully log out.";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
@@ -10,15 +10,14 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertCustomerSuccessRegisterMessage
- *
+ * Assert that success message is displayed after customer registered on frontend.
  */
 class AssertCustomerSuccessRegisterMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'Thank you for registering with Main Website Store.';
 
     /**
-     * Assert that success message is displayed after customer registered on frontend
+     * Assert that success message is displayed after customer registered on frontend.
      *
      * @param CustomerAccountCreate $registerPage
      * @return void
@@ -36,7 +35,7 @@ public function processAssert(CustomerAccountCreate $registerPage)
     }
 
     /**
-     * Text of success register message is displayed
+     * Text of success register message is displayed.
      *
      * @return string
      */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php
@@ -9,7 +9,7 @@
 use Magento\Customer\Test\Fixture\Customer;
 use Magento\Customer\Test\Page\CustomerAccountCreate;
 use Magento\Cms\Test\Page\CmsIndex;
-use Magento\Customer\Test\Page\CustomerAccountLogout;
+use Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep;
 use Magento\Mtf\TestCase\Injectable;
 
 /**
@@ -32,40 +32,49 @@ class RegisterCustomerFrontendEntityTest extends Injectable
     /* end tags */
 
     /**
+     * Customer registry page.
+     *
      * @var CustomerAccountCreate
      */
     protected $customerAccountCreate;
 
     /**
-     * @var CustomerAccountLogout
+     * Cms page.
+     *
+     * @var CmsIndex $cmsIndex
      */
-    protected $customerAccountLogout;
+    protected $cmsIndex;
 
     /**
-     * @var CmsIndex $cmsIndex
+     * Customer log out step.
+     *
+     * @var LogoutCustomerOnFrontendStep
      */
-    protected $cmsIndex;
+    protected $logoutCustomerOnFrontendStep;
 
     /**
+     * Inject data.
+     *
      * @param CustomerAccountCreate $customerAccountCreate
-     * @param CustomerAccountLogout $customerAccountLogout
      * @param CmsIndex $cmsIndex
+     * @param LogoutCustomerOnFrontendStep $logoutCustomerOnFrontendStep
+     * @return void
      */
     public function __inject(
         CustomerAccountCreate $customerAccountCreate,
-        CustomerAccountLogout $customerAccountLogout,
-        CmsIndex $cmsIndex
+        CmsIndex $cmsIndex,
+        LogoutCustomerOnFrontendStep $logoutCustomerOnFrontendStep
     ) {
-        $this->customerAccountLogout = $customerAccountLogout;
         $this->customerAccountCreate = $customerAccountCreate;
         $this->cmsIndex = $cmsIndex;
-        $this->customerAccountLogout->open();
+        $this->logoutCustomerOnFrontendStep = $logoutCustomerOnFrontendStep;
     }
 
     /**
      * Create Customer account on Storefront.
      *
      * @param Customer $customer
+     * @return void
      */
     public function test(Customer $customer)
     {
@@ -76,12 +85,12 @@ public function test(Customer $customer)
     }
 
     /**
-     * Logout customer from frontend account
+     * Logout customer from frontend account.
      *
-     * return void
+     * @return void
      */
     public function tearDown()
     {
-        $this->customerAccountLogout->open();
+        $this->logoutCustomerOnFrontendStep->run();
     }
 }
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
@@ -7,8 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Customer\Test\TestCase\RegisterCustomerFrontendEntityTest" summary="Register New Customer" ticketId="MAGETWO-23546">
-        <variation name="RegisterCustomerFrontendEntityTestVariation1">
-            <data name="description" xsi:type="string">Register new customer</data>
+        <variation name="RegisterCustomerFrontendEntityTestVariation1" summary="Register new customer">
             <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>
@@ -17,9 +16,9 @@
             <data name="customer/data/password_confirmation" xsi:type="string">123123q</data>
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerSuccessRegisterMessage" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerInGrid" />
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerLogout" />
         </variation>
-        <variation name="RegisterCustomerFrontendEntityTestVariation2">
-            <data name="description" xsi:type="string">Register new customer with subscribing</data>
+        <variation name="RegisterCustomerFrontendEntityTestVariation2" summary="Register new customer with subscribing">
             <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>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
@@ -15,11 +15,6 @@
  */
 class LogoutCustomerOnFrontendStep implements TestStepInterface
 {
-    /**
-     * Logout page title.
-     */
-    const LOGOUT_PAGE_TITLE = 'You are signed out.';
-
     /**
      * Cms index page.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Subscriber/Grid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Subscriber/Grid.php
@@ -7,13 +7,12 @@
 namespace Magento\Newsletter\Test\Block\Adminhtml\Subscriber;
 
 /**
- * Newsletter subscribers grid
- *
+ * Newsletter subscribers grid.
  */
-class Grid extends \Magento\Ui\Test\Block\Adminhtml\DataGrid
+class Grid extends \Magento\Backend\Test\Block\Widget\Grid
 {
     /**
-     * Filters array mapping
+     * Filters array mapping.
      *
      * @var array
      */
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
@@ -75,8 +75,11 @@ public function openLink($linkTitle)
      */
     public function isLinkVisible($linkTitle)
     {
-        $this->expandCustomerMenu();
-        return $this->_rootElement->find(sprintf($this->link, $linkTitle), Locator::SELECTOR_XPATH)->isVisible();
+        $link = $this->_rootElement->find(sprintf($this->link, $linkTitle), Locator::SELECTOR_XPATH);
+        if (!$link->isVisible()) {
+            $this->expandCustomerMenu();
+        }
+        return $link->isVisible();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,14 @@`
`10`	`10`	`use Magento\Mtf\Constraint\AbstractConstraint;`
`11`	`11`
`12`	`12`	`/**`
`13`		`- * Class AssertCustomerSuccessRegisterMessage`
`14`		`- *`
	`13`	`+ * Assert that success message is displayed after customer registered on frontend.`
`15`	`14`	`*/`
`16`	`15`	`class AssertCustomerSuccessRegisterMessage extends AbstractConstraint`
`17`	`16`	`{`
`18`	`17`	`const SUCCESS_MESSAGE = 'Thank you for registering with Main Website Store.';`
`19`	`18`
`20`	`19`	`/**`
`21`		`- * Assert that success message is displayed after customer registered on frontend`
	`20`	`+ * Assert that success message is displayed after customer registered on frontend.`
`22`	`21`	`*`
`23`	`22`	`* @param CustomerAccountCreate $registerPage`
`24`	`23`	`* @return void`
`@@ -36,7 +35,7 @@ public function processAssert(CustomerAccountCreate $registerPage)`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`/**`
`39`		`- * Text of success register message is displayed`
	`38`	`+ * Text of success register message is displayed.`
`40`	`39`	`*`
`41`	`40`	`* @return string`
`42`	`41`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,6 @@`
`15`	`15`	`*/`
`16`	`16`	`class LogoutCustomerOnFrontendStep implements TestStepInterface`
`17`	`17`	`{`
`18`		`- /**`
`19`		`- * Logout page title.`
`20`		`- */`
`21`		`- const LOGOUT_PAGE_TITLE = 'You are signed out.';`
`22`		`-`
`23`	`18`	`/**`
`24`	`19`	`* Cms index page.`
`25`	`20`	`*`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,11 @@ public function openLink($linkTitle)`
`75`	`75`	`*/`
`76`	`76`	`public function isLinkVisible($linkTitle)`
`77`	`77`	`{`
`78`		`- $this->expandCustomerMenu();`
`79`		`- return $this->_rootElement->find(sprintf($this->link, $linkTitle), Locator::SELECTOR_XPATH)->isVisible();`
	`78`	`+ $link = $this->_rootElement->find(sprintf($this->link, $linkTitle), Locator::SELECTOR_XPATH);`
	`79`	`+ if (!$link->isVisible()) {`
	`80`	`+ $this->expandCustomerMenu();`
	`81`	`+ }`
	`82`	`+ return $link->isVisible();`
`80`	`83`	`}`
`81`	`84`
`82`	`85`	`/**`