added ignore children testcase

sulu · Apr 19, 2017 · 0b55bf6 · 0b55bf6
1 parent ed6bacb
commit 0b55bf6
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/lib/Subscriber/Behavior/VersionSubscriber.php b/lib/Subscriber/Behavior/VersionSubscriber.php
@@ -285,7 +285,7 @@ private function restoreNode(
             );
         }
 
-        // remove child-nodes which does not exists in frozen-node
+        // remove child-nodes which do not exists in frozen-node
         foreach ($node->getNodes() as $childNode) {
             if ($childNode->getDefinition()->getOnParentVersion() !== OnParentVersionAction::COPY
                 || $frozenNode->hasNode($childNode->getName())

diff --git a/tests/Unit/Subscriber/Behavior/VersionSubscriberTest.php b/tests/Unit/Subscriber/Behavior/VersionSubscriberTest.php
@@ -457,4 +457,52 @@ function () use ($node, $newChild1Node, $newChild2Node, $newChild3Node) {
 
         $this->versionSubscriber->restoreProperties($event->reveal());
     }
+
+    public function testRestoreIgnoreChildren()
+    {
+        $event = $this->prophesize(RestoreEvent::class);
+        $document = $this->prophesize(VersionBehavior::class);
+        $node = $this->prophesize(NodeInterface::class);
+        $versionHistory = $this->prophesize(VersionHistoryInterface::class);
+        $version = $this->prophesize(JackalopeVersion::class);
+        $frozenNode = $this->prophesize(NodeInterface::class);
+
+        $node->getPath()->willReturn('/node');
+        $node->getProperties()->willReturn([]);
+        $node->hasNode('child')->willReturn(true);
+
+        $definition = $this->prophesize(NodeDefinitionInterface::class);
+        $definition->getOnParentVersion()->willReturn(OnParentVersionAction::IGNORE);
+
+        $childNode = $this->prophesize(NodeInterface::class);
+        $childNode->getName()->willReturn('child');
+        $childNode->getProperties()->willReturn([]);
+        $childNode->getNodes()->willReturn([]);
+        $childNode->getDefinition()->willReturn($definition->reveal());
+
+        $node->getNode('child')->willReturn($childNode->reveal());
+        $node->getNodes()->willReturn([$childNode->reveal()]);
+
+        $this->propertyEncoder->localizedContentName('', 'de')->willReturn('i18n:de-');
+        $this->propertyEncoder->localizedSystemName('', 'de')->willReturn('i18n:de-');
+
+        $frozenNode->getNodes()->willReturn([]);
+        $frozenNode->getPropertiesValues()->willReturn([]);
+        $frozenNode->hasNode(Argument::type('string'))->willReturn(false);
+
+        $event->getDocument()->willReturn($document->reveal());
+        $event->getNode()->willReturn($node->reveal());
+        $event->getVersion()->willReturn('1.0');
+        $event->getLocale()->willReturn('de');
+
+        $this->versionManager->getVersionHistory('/node')->willReturn($versionHistory->reveal());
+        $versionHistory->getVersion('1.0')->willReturn($version->reveal());
+        $version->getFrozenNode()->willReturn($frozenNode->reveal());
+
+        // the child-node should not be touched
+        $childNode->remove()->shouldNotBeCalled();
+        $childNode->setProperty(Argument::cetera())->shouldNotBeCalled();
+
+        $this->versionSubscriber->restoreProperties($event->reveal());
+    }
 }