Fixed tests

Author: dantleech

spec/PHPCR/Shell/Console/Helper/ResultFormatterHelperSpec.php

@@ -20,11 +20,10 @@ class ResultFormatterHelperSpec extends ObjectBehavior
 {
     public function let(
         TextHelper $textHelper,
-        TableHelper $tableHelper,
         Config $config
     )
     {
-        $this->beConstructedWith($textHelper, $tableHelper, $config);
+        $this->beConstructedWith($textHelper, $config);
     }
 
     public function it_is_initializable()

tests/PHPCR/Shell/Application/SessionApplicationTest.php

@@ -11,18 +11,19 @@
 
 namespace PHPCR\Shell\Console\Helper;
 
+use PHPCR\NodeInterface;
+
 class NodeHelperTest extends \PHPUnit_Framework_TestCase
 {
     protected $nodeHelper;
 
     public function setUp()
     {
-        $this->session = $this->getMock('PHPCR\SessionInterface');
-        $this->helper = new NodeHelper($this->session);
-        $this->node = $this->getMockBuilder('Jackalope\Node')
-            ->disableOriginalConstructor()->getMock();
+        $this->session = $this->prophesize('PHPCR\SessionInterface');
+        $this->helper = new NodeHelper($this->session->reveal());
+        $this->node = $this->prophesize(NodeInterface::class);
 
-        $this->nodeType1 = $this->getMock('PHPCR\NodeType\NodeTypeInterface');
+        $this->nodeType1 = $this->prophesize('PHPCR\NodeType\NodeTypeInterface');
     }
 
     public function provideAssertNodeIsVersionable()
@@ -38,21 +39,18 @@ public function provideAssertNodeIsVersionable()
      */
     public function testAssertNodeIsVersionable($isVersionable)
     {
-        $this->node->expects($this->once())
-            ->method('getMixinNodeTypes')
-            ->will($this->returnValue(array(
-                $this->nodeType1,
-            )));
+        $this->node->getMixinNodeTypes()->willReturn([
+            $this->nodeType1->reveal()
+        ]);
+        $this->node->getPath()->willReturn('/');
 
         $nodeTypeName = $isVersionable ? 'mix:versionable' : 'nt:foobar';
 
-        $this->nodeType1->expects($this->once())
-            ->method('getName')
-            ->will($this->returnValue($nodeTypeName));
+        $this->nodeType1->getName()->willReturn($nodeTypeName);
 
         if (false == $isVersionable) {
             $this->setExpectedException('\OutOfBoundsException', 'is not versionable');
         }
-        $this->helper->assertNodeIsVersionable($this->node);
+        $this->helper->assertNodeIsVersionable($this->node->reveal());
     }
 }

tests/PHPCR/Shell/Helper/NodeHelperTest.php

@@ -18,8 +18,8 @@ class PhpcrSessionTest extends \Phpunit_Framework_TestCase
 {
     public function setUp()
     {
-        $this->phpcr = $this->getMock('PHPCR\SessionInterface');
-        $this->session = new PhpcrSession($this->phpcr);
+        $this->phpcr = $this->prophesize('PHPCR\SessionInterface');
+        $this->session = new PhpcrSession($this->phpcr->reveal());
     }
 
     public function provideChdir()
@@ -80,12 +80,9 @@ public function provideMv()
      */
     public function testMv($cwd, $relSrc, $relTar, $expSrc, $expTar)
     {
-        $this->phpcr->expects($this->once())
-            ->method('move')
-            ->with($expSrc, $expTar);
-        $this->phpcr->expects($this->once())
-            ->method('getNode')
-            ->will($this->throwException(new PathNotFoundException()));
+        $this->phpcr->move($expSrc, $expTar)->shouldBeCalled();
+
+        $this->phpcr->getNode('/bar', -1)->willThrow(new PathNotFoundException());
         $this->session->setCwd($cwd);
         $this->session->move($relSrc, $relTar);
     }