MAGETWO-38892: [TD] Fix functional tests

- CR fixes

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;
     }
 }

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 = [];
             }