Merge remote-tracking branch 'origin/MAGETWO-91412' into 2.2-develop-pr35

Author: StasKozar

dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/CaseInfo.php

@@ -73,7 +73,7 @@ class CaseInfo extends Block
      *
      * @var string
      */
-    private $orderAmount = '[ng-bind*="currentCase.orderAmount"]';
+    private $orderAmount = '[ng-bind*="currentCase.orderTotalAmount"]';
 
     /**
      * Locator value for order amount currency.

dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/CaseSearch.php

@@ -33,6 +33,20 @@ class CaseSearch extends Form
      */
     private $selectCaseLink = 'ul[case-list=cases] li[case-list-case=case] a';
 
+    /**
+     * Locator for resolving applied filters list.
+     *
+     * @var string
+     */
+    private $appliedFilters = '.app-taglist > ul > li > a';
+
+    /**
+     * Locator for loading spinner.
+     *
+     * @var string
+     */
+    private $spinner = '.cases-loading-spinner';
+
     /**
      * Fill search input with customer name and submit.
      *
@@ -41,8 +55,46 @@ class CaseSearch extends Form
      */
     public function searchCaseByCustomerName($customerName)
     {
+        $this->resetFilters();
         $this->_rootElement->find($this->searchBar)->setValue($customerName);
         $this->_rootElement->find($this->submitButton)->click();
+        $this->waitLoadingSpinner();
+    }
+
+    /**
+     * Reset applied filters.
+     *
+     * @return void
+     */
+    private function resetFilters()
+    {
+        $filters = $this->_rootElement->getElements($this->appliedFilters);
+        if (!empty($filters)) {
+            foreach ($filters as $filter) {
+                $filter->click();
+                $this->waitLoadingSpinner();
+            }
+        }
+    }
+
+    /**
+     * Wait until loading spinner disappeared.
+     *
+     * @return void
+     */
+    private function waitLoadingSpinner()
+    {
+        $this->waitForElementNotVisible($this->spinner);
+    }
+
+    /**
+     * Checks if any case is visible.
+     *
+     * @return bool
+     */
+    public function isAnyCaseVisible()
+    {
+        return $this->_rootElement->find($this->selectCaseLink)->isVisible();
     }
 
     /**

dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/SignifydLogin.php

@@ -6,6 +6,8 @@
 namespace Magento\Signifyd\Test\Block\SignifydConsole;
 
 use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Signifyd login block.
@@ -19,13 +21,44 @@ class SignifydLogin extends Form
      */
     private $loginButton = '[type=submit]';
 
+    /**
+     * Locator for admin form notification window.
+     *
+     * @var string
+     */
+    private $notificationCloseButton = '.wm-close-button';
+
+    /**
+     * @inheritdoc
+     */
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
+    {
+        $this->closeNotification();
+
+        return parent::fill($fixture, $element);
+    }
+
     /**
      * Login to Signifyd.
      *
      * @return void
      */
     public function login()
     {
+        $this->closeNotification();
         $this->_rootElement->find($this->loginButton)->click();
     }
+
+    /**
+     * Close notification popup.
+     *
+     * @return void
+     */
+    private function closeNotification()
+    {
+        $notification = $this->browser->find($this->notificationCloseButton);
+        if ($notification->isVisible()) {
+            $notification->click();
+        }
+    }
 }

dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.xml

@@ -62,7 +62,6 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertCancelInCommentsHistory" />
             <constraint name="Magento\Signifyd\Test\Constraint\AssertSignifydCaseInCommentsHistory" />
             <constraint name="Magento\Signifyd\Test\Constraint\AssertAwaitingSignifydGuaranteeInCommentsHistory" />
-            <constraint name="Magento\Signifyd\Test\Constraint\AssertSignifydGuaranteeCancelInCommentsHistory" />
         </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydObserveCaseStep.php

@@ -75,6 +75,11 @@ class SignifydObserveCaseStep implements TestStepInterface
      */
     private $testStepFactory;
 
+    /**
+     * @var int
+     */
+    private $searchAttempts = 10;
+
     /**
      * @param AssertCaseInfoOnSignifydConsole $assertCaseInfoOnSignifydConsole
      * @param SignifydAddress $signifydAddress
@@ -111,8 +116,16 @@ public function __construct(
     public function run()
     {
         $this->signifydCases->open();
-        $this->signifydCases->getCaseSearchBlock()
-            ->searchCaseByCustomerName($this->signifydAddress->getFirstname());
+        // Search case few times because it can appear with delay.
+        for ($attempts = $this->searchAttempts; $attempts > 0; $attempts--) {
+            $this->signifydCases->getCaseSearchBlock()
+                ->searchCaseByCustomerName($this->signifydAddress->getFirstname());
+            if ($this->signifydCases->getCaseSearchBlock()->isAnyCaseVisible()) {
+                break;
+            }
+            sleep(3);
+        }
+
         $this->signifydCases->getCaseSearchBlock()->selectCase();
         $this->signifydCases->getCaseInfoBlock()->flagCase($this->signifydData->getCaseFlag());