From 423cdf3796fcc428bd2f734f70fe11ee41add272 Mon Sep 17 00:00:00 2001
From: Volodymyr Sevostianov <vsevostianov@ebay.com>
Date: Fri, 26 Jun 2015 19:03:37 +0300
Subject: [PATCH] MAGETWO-38892: [TD] Fix functional tests

- CR fixes
---
 .../GiftMessage/Test/Block/Message/Order/Items/View.php        | 3 +--
 .../Test/Constraint/AssertGiftMessageInFrontendOrderItems.php  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
index 37c4d340657..c5799d3fcaa 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
@@ -100,10 +100,9 @@ class View extends Block
      */
     protected function giftMessageButtonIsVisible($itemName)
     {
-        $isVisible = $this->_rootElement->find(
+        return $isVisible = $this->_rootElement->find(
             sprintf($this->giftMessageButtonSelector, $itemName),
             Locator::SELECTOR_XPATH
         )->isVisible();
-        return $isVisible;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
index 7bc4a02cc00..932115cdf37 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
@@ -62,7 +62,7 @@ class AssertGiftMessageInFrontendOrderItems extends AbstractConstraint
                     'message' => $itemGiftMessage->getMessage(),
                 ];
             }
-            if ($product->getIsVirtual() == 'Yes'){
+            if ($product->getIsVirtual() == 'Yes') {
                 $expectedData = [];
             }
 
-- 
GitLab