From 27e1d24bec170cba394500e150b838290de383d1 Mon Sep 17 00:00:00 2001
From: Ostap Smolyar <ostap.smolyar@gmail.com>
Date: Fri, 30 Dec 2016 15:21:26 +0200
Subject: [PATCH] MTA-3952: Refactoring comments history block in Order module
---
.../AssertTransactionIsPresentInSettlementReport.php | 4 ++--
.../AssertAcceptPaymentMessageInCommentsHistory.php | 4 ++--
.../Test/Constraint/AssertAuthorizationInCommentsHistory.php | 2 +-
.../Sales/Test/Constraint/AssertCaptureInCommentsHistory.php | 2 +-
.../Constraint/AssertDenyPaymentMessageInCommentsHistory.php | 4 ++--
.../Sales/Test/Constraint/AssertRefundInCommentsHistory.php | 2 +-
.../Constraint/AssertRefundOrderStatusInCommentsHistory.php | 4 ++--
.../Sales/Test/Constraint/AssertVoidInCommentsHistory.php | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertTransactionIsPresentInSettlementReport.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertTransactionIsPresentInSettlementReport.php
index 1a8f35587e5..434e41bb500 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertTransactionIsPresentInSettlementReport.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertTransactionIsPresentInSettlementReport.php
@@ -70,9 +70,9 @@ class AssertTransactionIsPresentInSettlementReport extends AbstractConstraint
}
/**
- * Get transaction id from order comments
+ * Get transaction id from order comments.
*
- * @return mixed
+ * @return null|string
*/
private function getTransactionId()
{
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php
index 0b041c8c119..d9c75b3c9da 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php
@@ -10,7 +10,7 @@ use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
/**
- * Assert that accept payment message exist in Comments History section on order page in Admin.
+ * Assert that accept payment message exists in Comments History section on order page in Admin.
*
*/
class AssertAcceptPaymentMessageInCommentsHistory extends AbstractConstraint
@@ -23,7 +23,7 @@ class AssertAcceptPaymentMessageInCommentsHistory extends AbstractConstraint
private static $message = 'Approved the payment online.';
/**
- * Assert that accept payment message exist in Comments History section on order page in Admin.
+ * Assert that accept payment message exists in Comments History section on order page in Admin.
*
* @param SalesOrderView $salesOrderView
* @param OrderIndex $orderIndex
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
index 13ceba996e9..309a3795e68 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
@@ -21,7 +21,7 @@ class AssertAuthorizationInCommentsHistory extends AbstractConstraint
const AUTHORIZED_AMOUNT_PATTERN = '/(IPN "Pending" )*Authorized amount of \w*\W{1,2}%s. Transaction ID: "[\w\-]*"/';
/**
- * Assert that comment about authorized amount exist in Comments History section on order page in Admin.
+ * Assert that comment about authorized amount exists in Comments History section on order page in Admin.
*
* @param SalesOrderView $salesOrderView
* @param OrderIndex $salesOrder
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php
index 5ca9c6ef9bc..14379c279fe 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php
@@ -22,7 +22,7 @@ class AssertCaptureInCommentsHistory extends AbstractConstraint
const CAPTURED_AMOUNT_PATTERN = '/^Captured amount of \w*\W{1,2}%s online. Transaction ID: "[\w\-]*"/';
/**
- * Assert that comment about captured amount exist in Comments History section on order page in Admin.
+ * Assert that comment about captured amount exists in Comments History section on order page in Admin.
*
* @param SalesOrderView $salesOrderView
* @param OrderIndex $salesOrder
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php
index 8e95790dd85..1fca0cc1886 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php
@@ -10,7 +10,7 @@ use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
/**
- * Assert that deny payment message exist in Comments History section on order page in Admin.
+ * Assert that deny payment message exists in Comments History section on order page in Admin.
*
* Constraint checks deny payment message in order comments history
*/
@@ -24,7 +24,7 @@ class AssertDenyPaymentMessageInCommentsHistory extends AbstractConstraint
private static $message = 'Denied the payment online';
/**
- * Assert that deny payment message exist in Comments History section on order page in Admin.
+ * Assert that deny payment message exists in Comments History section on order page in Admin.
*
* @param SalesOrderView $salesOrderView
* @param OrderIndex $orderIndex
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php
index 5b035fc420a..db16052ed10 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php
@@ -21,7 +21,7 @@ class AssertRefundInCommentsHistory extends AbstractConstraint
const REFUNDED_AMOUNT_PATTERN = '/^We refunded \w*\W{1,2}%s online. Transaction ID: "[\w\-]*"/';
/**
- * Assert that comment about refunded amount exist in Comments History section on order page in Admin.
+ * Assert that comment about refunded amount exists in Comments History section on order page in Admin.
*
* @param SalesOrderView $salesOrderView
* @param OrderIndex $salesOrder
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php
index c6f72f427d0..c90bbf68531 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php
@@ -11,12 +11,12 @@ use Magento\Mtf\Constraint\AbstractConstraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
/**
- * Assert that comment with correct order status exist in Comments History section on order page in Admin.
+ * Assert that comment with correct order status exists in Comments History section on order page in Admin.
*/
class AssertRefundOrderStatusInCommentsHistory extends AbstractConstraint
{
/**
- * Assert that comment with correct order status exist in Comments History section on order page in Admin.
+ * Assert that comment with correct order status exists in Comments History section on order page in Admin.
*
* @param SalesOrderView $salesOrderView
* @param OrderIndex $salesOrder
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php
index 1b9c48fdc4a..b3df74ea74a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php
@@ -21,7 +21,7 @@ class AssertVoidInCommentsHistory extends AbstractConstraint
const VOIDED_AMOUNT = 'Voided authorization. Amount: $';
/**
- * Assert that comment about voided amount exist in Comments History section on order page in Admin.
+ * Assert that comment about voided amount exists in Comments History section on order page in Admin.
*
* @param SalesOrderView $salesOrderView
* @param OrderIndex $salesOrder
--
GitLab