MAGETWO-31059: Integration tests with fatals, code under test and framework adaptation

Author: Sanuch

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -779,7 +779,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
                     }
 
                     if (!isset($_result[0])) {
-                        return __('Cannot add the item to shopping cart')->render();
+                        return __('Cannot add the item to shopping cart');
                     }
 
                     /**

app/code/Magento/Downloadable/Model/Product/Type.php

@@ -482,7 +482,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
             return $result;
         }
         if ($this->getLinkSelectionRequired($product) && $this->_isStrictProcessMode($processMode)) {
-            return __('Please specify product link(s).')->render();
+            return __('Please specify product link(s).');
         }
         return $result;
     }

app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php

@@ -361,7 +361,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
                             }
 
                             if (!isset($_result[0])) {
-                                return __('We cannot process the item.')->render();
+                                return __('We cannot process the item.');
                             }
 
                             if ($isStrictProcessMode) {
@@ -399,7 +399,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
             }
         }
 
-        return __('Please specify the quantity of product(s).')->render();
+        return __('Please specify the quantity of product(s).');
     }
 
     /**

dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php

@@ -74,7 +74,7 @@ public function testGetOptionTextForExistLabel()
     {
         $existValue = 1;
 
-        $this->assertInstanceOf('Magento\Framework\Phrase', $this->model->getOptionText($existValue));
+        $this->assertInternalType('string', $this->model->getOptionText($existValue));
     }
 
     /**

dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php

@@ -84,7 +84,7 @@ public function testGetHeaderText($modelBlockId)
             ->with($title)
             ->willReturn($escapedTitle);
 
-        $this->assertInstanceOf('Magento\Framework\Phrase', $this->this->getHeaderText());
+        $this->assertInternalType('string', $this->this->getHeaderText());
     }
 
     public function getHeaderTextDataProvider()

dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php

@@ -19,7 +19,7 @@
 class ConfirmTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Customer\Controller\Account
+     * @var \Magento\Customer\Controller\Account\Confirm
      */
     protected $model;
 
@@ -388,12 +388,12 @@ public function testSuccessRedirect(
             ->with($this->equalTo('*/*/index'), ['_secure' => true])
             ->will($this->returnValue($successUrl));
 
-        $this->redirectMock->expects($this->never())
+        $this->redirectMock->expects($this->once())
             ->method('success')
             ->with($this->equalTo($resultUrl))
             ->will($this->returnValue($resultUrl));
 
-        $this->scopeConfigMock->expects($this->never())
+        $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD),