MAGETWO-85734: Sprint 5 Build Stabilization & PR

 - fixed failing unit tests

Author: Cari Spruiell

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/EditTest.php

@@ -62,6 +62,11 @@ class EditTest extends \PHPUnit\Framework\TestCase
      */
     protected $session;
 
+    /**
+     * @var \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $presentation;
+
     /**
      * @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -128,6 +133,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->presentation = $this->getMockBuilder(
+            \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class
+        )->disableOriginalConstructor()
+            ->getMock();
+
         $this->blockTemplate = $this->getMockBuilder(\Magento\Backend\Block\Template::class)
             ->setMethods(['setIsPopup'])
             ->disableOriginalConstructor()
@@ -169,9 +179,10 @@ public function testExecutePopup()
             ->with(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->willReturn($this->eavAttribute);
         $this->objectManagerMock->expects($this->any())->method('get')
-            ->with(\Magento\Backend\Model\Session::class)
-            ->willReturn($this->session);
-
+            ->willReturnMap([
+                [\Magento\Backend\Model\Session::class, $this->session],
+                [\Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class, $this->presentation]
+            ]);
         $this->eavAttribute->expects($this->once())->method('setEntityTypeId')->willReturnSelf();
         $this->eavAttribute->expects($this->once())->method('addData')->with($attributesData)->willReturnSelf();
         $this->eavAttribute->expects($this->any())->method('getName')->willReturn(null);
@@ -219,8 +230,10 @@ public function testExecuteNoPopup()
             ->with(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->willReturn($this->eavAttribute);
         $this->objectManagerMock->expects($this->any())->method('get')
-            ->with(\Magento\Backend\Model\Session::class)
-            ->willReturn($this->session);
+            ->willReturnMap([
+                [\Magento\Backend\Model\Session::class, $this->session],
+                [\Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class, $this->presentation]
+            ]);
 
         $this->eavAttribute->expects($this->once())->method('setEntityTypeId')->willReturnSelf();
         $this->eavAttribute->expects($this->once())->method('addData')->with($attributesData)->willReturnSelf();

app/code/Magento/Eav/Test/Unit/Model/Adminhtml/System/Config/Source/InputtypeTest.php

@@ -22,6 +22,7 @@ public function testToOptionArray()
         $expectedResult = [
             ['value' => 'text', 'label' => 'Text Field'],
             ['value' => 'textarea', 'label' => 'Text Area'],
+            ['value' => 'texteditor', 'label' => 'Text Editor'],
             ['value' => 'date', 'label' => 'Date'],
             ['value' => 'boolean', 'label' => 'Yes/No'],
             ['value' => 'multiselect', 'label' => 'Multiple Select'],