TASK: Merge branch '3.3' into 4.0

neos · May 8, 2018 · 176aa62 · 176aa62
2 parents 07a250b + 834a23a
commit 176aa62
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Tests/Functional/Service/Mapping/NodePropertyConverterServiceTest.php b/Tests/Functional/Service/Mapping/NodePropertyConverterServiceTest.php
@@ -17,6 +17,7 @@
 use Neos\Media\Domain\Model\ImageInterface;
 use Neos\Neos\Domain\Model\Domain;
 use Neos\Neos\Service\Mapping\NodePropertyConverterService;
+use Neos\Neos\Ui\Fusion\Helper\ActivationHelper;
 
 /**
  * Functional test case which tests the node property converter
@@ -149,6 +150,10 @@ public function arrayOfStringsHasToProvideTypeConverterToBeConvertedToArrayOfStr
      */
     public function complexTypesWithGivenTypeConverterAreConvertedByTypeConverter()
     {
+        $mockActivationHelper = self::getMockBuilder(ActivationHelper::class)->getMock();
+        $mockActivationHelper->expects(self::any())->method('isLegacyBackendEnabled')->willReturn(true);
+        $this->objectManager->setInstance(ActivationHelper::class, $mockActivationHelper);
+
         $propertyValue = $this->getMockForAbstractClass(ImageInterface::class);
         $expected = json_encode([
             '__identity' => null,
@@ -163,7 +168,7 @@ public function complexTypesWithGivenTypeConverterAreConvertedByTypeConverter()
         $nodeType
             ->expects($this->any())
             ->method('getPropertyType')
-            ->willReturn('Neos\Media\Domain\Model\ImageInterface');
+            ->willReturn(ImageInterface::class);
 
         $node = $this
             ->getMockBuilder(Node::class)