MAGETWO-63855: Create functional automated for complete Signifyd flow

 - code review fixes

Author: iivashchenko

Test/Block/Sandbox/CaseInfo.php

@@ -73,7 +73,7 @@ class CaseInfo extends Block
      *
      * @var string
      */
-    private $cardHolder = '[data-dropdown="peopleLinks0"] span';
+    private $cardHolder = '[data-dropdown="peopleLinks0"]';
 
     /**
      * Css selector of displayed billing address.

Test/Constraint/AssertCaseInfoOnBackend.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Signifyd\Test\Constraint;
 
-use Magento\Signifyd\Test\Page\Adminhtml\OrderView;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -16,7 +16,7 @@ class AssertCaseInfoOnBackend extends AbstractConstraint
     /**
      * Customized order view page.
      *
-     * @var OrderView
+     * @var SalesOrderView
      */
     private $orderView;
 
@@ -37,15 +37,15 @@ class AssertCaseInfoOnBackend extends AbstractConstraint
     /**
      * Assert that Signifyd Case information is correct on backend.
      *
-     * @param OrderView $orderView
+     * @param SalesOrderView $orderView
      * @param string $orderId
      * @param array $signifydData
      * @return void
      */
     public function processAssert(
-        OrderView $orderView,
+        SalesOrderView $orderView,
         $orderId,
-        $signifydData
+        array $signifydData
     ) {
         $this->orderView = $orderView;
         $this->orderView->open(['order_id' => $orderId]);

Test/Constraint/AssertSignifydCaseInOrdersGrid.php

@@ -6,7 +6,7 @@
 
 namespace Magento\Signifyd\Test\Constraint;
 
-use Magento\Signifyd\Test\Page\Adminhtml\OrderView;
+use Magento\Signifyd\Test\Page\Adminhtml\OrdersGrid;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -19,14 +19,14 @@ class AssertSignifydCaseInOrdersGrid extends AbstractConstraint
      *
      * @param string $orderId
      * @param string $status
-     * @param OrderView $orderView
+     * @param OrdersGrid $ordersGrid
      * @param array $signifydData
      * @return void
      */
     public function processAssert(
         $orderId,
         $status,
-        OrderView $orderView,
+        OrdersGrid $ordersGrid,
         array $signifydData
     ) {
         $filter = [
@@ -37,11 +37,11 @@ public function processAssert(
 
         $errorMessage = implode(', ', $filter);
 
-        $orderView->open();
+        $ordersGrid->open();
 
         \PHPUnit_Framework_Assert::assertTrue(
-            $orderView->getSalesOrderGrid()->isRowVisible(array_filter($filter)),
-            'Order with following data \'' . $errorMessage . '\' is absent in Orders grid.'
+            $ordersGrid->getSignifydOrdersGrid()->isRowVisible(array_filter($filter)),
+            'Order with following data \'' . $errorMessage . '\' is absent in orders grid.'
         );
     }
 

Test/Page/Adminhtml/OrdersGrid.xml

@@ -0,0 +1,12 @@
+<?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/pages.xsd">
+    <page name="ordersGrid" area="Adminhtml" mca="sales/order" module="Magento_Signifyd">
+        <block name="signifydOrdersGrid" class="Magento\Signifyd\Test\Block\Adminhtml\Order\Grid" locator="//div[contains(@data-bind, 'sales_order_grid')]" strategy="xpath" />
+    </page>
+</config>

Test/Page/Adminhtml/OrderView.xml renamed to Test/Page/Adminhtml/SalesOrderView.xml

@@ -6,8 +6,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
-    <page name="OrderView" area="Adminhtml" mca="sales/order/view" module="Magento_Signifyd">
+    <page name="SalesOrderView" area="Adminhtml" mca="sales/order/view">
         <block name="fraudProtectionBlock" class="Magento\Signifyd\Test\Block\Adminhtml\Order\View\FraudProtection" locator=".admin__page-section.order-case-info" strategy="css selector" />
-        <block name="salesOrderGrid" class="Magento\Signifyd\Test\Block\Adminhtml\Order\Grid" locator="//div[contains(@data-bind, 'sales_order_grid')]" strategy="xpath" />
     </page>
 </config>

Test/TestStep/OpenOrderGridStep.php

@@ -5,19 +5,18 @@
  */
 namespace Magento\Signifyd\Test\TestStep;
 
-use Magento\Sales\Test\Fixture\OrderInjectable;
-use Magento\Sales\Test\TestStep\OpenOrderStep;
+use Magento\Mtf\TestStep\TestStepInterface;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
 use Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect as AssertOrderStatus;
 use Magento\Signifyd\Test\Constraint\AssertSignifydCaseInOrdersGrid as AssertOrdersGrid;
 use Magento\Signifyd\Test\Constraint\AssertCaseInfoOnBackend;
-use Magento\Signifyd\Test\Page\Adminhtml\OrderView;
+use Magento\Signifyd\Test\Page\Adminhtml\OrdersGrid;
 
 /**
  * Open order grid step.
  */
-class OpenOrderGridStep extends OpenOrderStep
+class OpenOrderGridStep implements TestStepInterface
 {
     /**
      * Magento order status assertion.
@@ -47,6 +46,14 @@ class OpenOrderGridStep extends OpenOrderStep
      */
     private $orderStatus;
 
+    /**
+     * Magento order id.
+     *
+     * @var int
+     */
+    private $orderId;
+
+
     /**
      * Order View Page.
      *
@@ -55,11 +62,11 @@ class OpenOrderGridStep extends OpenOrderStep
     private $salesOrderView;
 
     /**
-     * Customized order view page.
+     * Orders grid page.
      *
-     * @var OrderView
+     * @var OrdersGrid
      */
-    private $orderView;
+    private $ordersGrid;
 
     /**
      * Array of Signifyd config data.
@@ -70,35 +77,34 @@ class OpenOrderGridStep extends OpenOrderStep
 
     /**
      * @param string $status
-     * @param OrderInjectable $order
+     * @param int $orderId
      * @param OrderIndex $orderIndex
      * @param SalesOrderView $salesOrderView
-     * @param OrderView $orderView
+     * @param OrdersGrid $ordersGrid
      * @param AssertOrderStatus $assertOrderStatus
      * @param AssertCaseInfoOnBackend $assertCaseInfo
      * @param AssertOrdersGrid $assertOrdersGrid
      * @param array $signifydData
      */
     public function __construct(
         $status,
-        OrderInjectable $order,
+        $orderId,
         OrderIndex $orderIndex,
         SalesOrderView $salesOrderView,
-        OrderView $orderView,
+        OrdersGrid $ordersGrid,
         AssertOrderStatus $assertOrderStatus,
         AssertCaseInfoOnBackend $assertCaseInfo,
         AssertOrdersGrid $assertOrdersGrid,
         array $signifydData
     ) {
         $this->orderStatus = $status;
+        $this->orderId = $orderId;
+        $this->orderIndex = $orderIndex;
+        $this->salesOrderView = $salesOrderView;
+        $this->ordersGrid = $ordersGrid;
         $this->assertOrderStatus = $assertOrderStatus;
         $this->assertCaseInfo = $assertCaseInfo;
         $this->assertOrdersGrid = $assertOrdersGrid;
-        $this->salesOrderView = $salesOrderView;
-        $this->orderView = $orderView;
-        $this->orderIndex = $orderIndex;
-
-        parent::__construct($order, $this->orderIndex);
         $this->signifydData = $signifydData;
     }
 
@@ -109,53 +115,51 @@ public function __construct(
      */
     public function run()
     {
-        parent::run();
-
         $this->checkOrdersGrid();
         $this->checkOrderStatus();
         $this->checkCaseInfo();
     }
 
     /**
-     * Run assert to check order status is valid.
+     * Run assert to check Signifyd Case Disposition status in orders grid.
      *
      * @return void
      */
-    private function checkOrderStatus()
+    private function checkOrdersGrid()
     {
-        $this->assertOrderStatus->processAssert(
+        $this->assertOrdersGrid->processAssert(
+            $this->orderId,
             $this->orderStatus,
-            $this->order->getId(),
-            $this->orderIndex,
-            $this->salesOrderView
+            $this->ordersGrid,
+            $this->signifydData
         );
     }
 
     /**
-     * Run assert to check Signifyd Case information is correct on backend.
+     * Run assert to check order status is valid.
      *
      * @return void
      */
-    private function checkCaseInfo()
+    private function checkOrderStatus()
     {
-        $this->assertCaseInfo->processAssert(
-            $this->orderView,
-            $this->order->getId(),
-            $this->signifydData
+        $this->assertOrderStatus->processAssert(
+            $this->orderStatus,
+            $this->orderId,
+            $this->orderIndex,
+            $this->salesOrderView
         );
     }
 
     /**
-     * Run assert to check Signifyd Case Disposition status in orders grid.
+     * Run assert to check Signifyd Case information is correct on backend.
      *
      * @return void
      */
-    private function checkOrdersGrid()
+    private function checkCaseInfo()
     {
-        $this->assertOrdersGrid->processAssert(
-            $this->order->getId(),
-            $this->orderStatus,
-            $this->orderView,
+        $this->assertCaseInfo->processAssert(
+            $this->salesOrderView,
+            $this->orderId,
             $this->signifydData
         );
     }