Node remove fixes

- Bug: Removing a node always moves the current n path back one

Author: dantleech

features/bootstrap/FeatureContext.php

@@ -652,6 +652,16 @@ public function theCurrentNodeIs($arg1)
         $this->executeCommand(sprintf('cd %s', $arg1));
     }
 
+    /**
+     * @Given /^the current node should be "([^"]*)"$/
+     */
+    public function theCurrentNodeShouldBe($arg1)
+    {
+        $this->executeCommand('shell:path:show');
+        $cnp = $this->applicationTester->getLastLine();
+        PHPUnit_Framework_Assert::assertEquals($arg1, $cnp, 'Current path is ' . $arg1);
+    }
+
     /**
      * @Given /^the current workspace is "([^"]*)"$/
      */

features/phpcr_node_remove.feature

@@ -7,9 +7,28 @@ Feature: Remove a node
         Given that I am logged in as "testuser"
         And the "session_data.xml" fixtures are loaded
 
-    Scenario: Remove a node
+    Scenario: Remove the current node
         Given the current node is "/tests_general_base"
         And I execute the "node:remove ." command
         Then the command should not fail
         And I save the session
         And there should not exist a node at "/tests_general_base"
+        And the current node should be "/"
+
+    Scenario: Remove a non-current node
+        Given the current node is "/tests_general_base"
+        And I execute the "node:remove daniel" command
+        Then the command should not fail
+        And I save the session
+        And there should not exist a node at "/tests_general_base/daniel"
+        And the current node should be "/tests_general_base"
+
+    Scenario: Delete root node
+        Given the current node is "/"
+        And I execute the "node:remove ." command
+        Then the command should fail
+        And I should see the following:
+        """
+        You cannot delete the root node
+        """
+

src/PHPCR/Shell/Console/Command/Phpcr/NodeRemoveCommand.php

@@ -23,17 +23,24 @@ protected function configure()
     public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->getHelper('phpcr')->getSession();
-        $path = $session->getAbsPath($input->getArgument('path'));
-        $currentNode = $session->getNode($path);
-        $currentPath = $currentNode->getPath();
+        $targetPath = $session->getAbsPath($input->getArgument('path'));
+        $currentPath = $session->getCwd();
 
-        if ($currentPath == '/') {
+        // verify that node exists by trying to get it..
+        $targetNode = $session->getNode($targetPath);
+
+        if ($targetPath == '/') {
             throw new \InvalidArgumentException(
-                'Cannot delete root node!'
+                'You cannot delete the root node!'
             );
         }
 
-        $session->removeItem($currentPath);
-        $session->chdir('..');
+        $session->removeItem($targetPath);
+
+        // if we deleted the current path, switch back to the parent node
+        if ($currentPath == $targetPath) {
+            echo $currentPath . ' vs. ' . $targetPath;
+            $session->chdir('..');
+        }
     }
 }

src/PHPCR/Shell/Test/ApplicationTester.php

@@ -90,6 +90,18 @@ public function getDisplay($normalize = false)
         return $display;
     }
 
+    public function getLastLine()
+    {
+        $display = trim($this->getDisplay());
+        $lines = explode("\n", $display);
+
+        if ($lines) {
+            return end($lines);
+        }
+
+        return $display;
+    }
+
     /**
      * Gets the input instance used by the last execution of the application.
      *