Fixed some other features

Author: dantleech

features/bootstrap/FeatureContext.php

@@ -61,7 +61,6 @@ public function beforeScenario()
     /**
      * Cleans test folders in the temporary directory.
      *
-     * @BeforeSuite
      * @AfterSuite
      */
     public static function cleanTestFolders()
@@ -785,4 +784,13 @@ public function theNodeShouldNotBeLocked($arg1)
 
         PHPUnit_Framework_Assert::assertFalse($isLocked);
     }
+
+    /**
+     * @Given /^I purge the current workspace$/
+     */
+    public function iPurgeTheCurrentWorkspace()
+    {
+        $session = $this->getSession();
+        NodeHelper::purgeWorkspace($session);
+    }
 }

features/lock_token_remove.feature

@@ -9,7 +9,7 @@ Feature: Remove a lock token in the current session
     Scenario: Create a new node
         Given I execute the "lock:token:remove foobar" command
         Then the command should fail
-        Then I should not see the following:
+        Then I should see the following:
         """
         Not implemented
         """

features/workspace_namespace_register.feature

@@ -5,8 +5,14 @@ Feature: Register a namespace on the workspace
 
     Background:
         Given that I am logged in as "testuser"
-        And the "clean.xml" system view fixtures are loaded
 
-    Scenario: List namespaces
-        Given I execute the "workspace:namespace:register dcms http://foobar.com/ns" command
-        Then the command should not fail
+    # We cannot test namespace registration because jackrabbit does not support
+    # namespace unregistration, so we simply try doing something which provokes
+    # to throw an exception.
+    Scenario: Attemp to register a default namespace
+        Given I execute the "workspace:namespace:register foo http\://www.jcp.org/jcr/nt/1.0" command
+        Then the command should fail
+        And I should see the following:
+        """
+        Can not change default namespace
+        """

features/workspace_namespace_unregister.feature

@@ -5,13 +5,14 @@ Feature: Unregister a namespace on the workspace
 
     Background:
         Given that I am logged in as "testuser"
-        And the "session_data.xml" fixtures are loaded
 
-    Scenario: List namespaces
-        Given the namespace "http://foobar.com/ns" with prefix "foo" exists
-        And I execute the "workspace:namespace:unregister http://foobar.com/ns" command
+    # We cannot test namespace registration because jackrabbit does not support
+    # namespace unregistration, so we simply try doing something which provokes
+    # to throw an exception.
+    Scenario: Attemp to unregister a default namespace
+        Given I execute the "workspace:namespace:unregister internal" command
         Then the command should fail
         And I should see the following:
         """
-        not supported by jackrabbit backend
+        Unregistering namespace not supported by jackrabbit backend
         """

features/workspace_node_clone.feature

@@ -10,16 +10,20 @@ Feature: Clone a node from a given workspace to the current workspace
         And the current workspace is "default"
         And the "cms.xml" fixtures are loaded
 
-        #    Scenario: Clone node
-        #        Given the current workspace is "default"
-        #        And I execute the "workspace:node:clone default_1 /cms/articles/article1 /cms/clone" command
-        #        Then the command should not fail
-        #        And I save the session
-        #        And there should exist a node at "/cms/clone"
+    Scenario: Clone node
+        Given the current workspace is "default"
+        And I execute the "workspace:node:clone default_1 /cms/articles/article1 /cms/clone" command
+        Then the command should not fail
+        And I save the session
+        And there should exist a node at "/cms/clone"
 
     Scenario: Clone onto existing
         Given I execute the "workspace:node:clone default_1 /cms/articles/article1 /cms/articles" command
         Then the command should fail
+        And I should see the following:
+        """
+        Node already exists at destination
+        """
 
     Scenario: Clone onto existing but remove
         Given I execute the "workspace:node:clone --remove-existing default_1 /cms/articles/article1 /cms/articles/article1" command

features/workspace_node_copy.feature

@@ -7,17 +7,16 @@ Feature: Copy a node from a given workspace to the current workspace
         Given that I am logged in as "testuser"
         And the current workspace is "default_1"
         And the "session_data.xml" fixtures are loaded
-        And the "all_property_types.xml" fixtures are loaded
         And the current workspace is "default"
         And I purge the current workspace
 
     Scenario: Copy node from a different workspace
-        Given I execute the "workspace:node:copy /tests_general_base/index.txt /index.txt test" command
+        Given I execute the "workspace:node:copy /tests_general_base/index.txt /index.txt default_1" command
         Then the command should not fail
         And there should exist a node at "/index.txt"
 
     Scenario: Copy node in the same workspace
-        And I execute the "workspace:node:copy /tests_general_base/index.txt /index.txt" command
+        And I execute the "workspace:node:copy /tests_general_base/index.txt /tests_general_base/index.txt.2" command
         Then the command should not fail
         And I save the session
-        And there should exist a node at "/index.txt"
+        And there should exist a node at "/tests_general_base/index.txt.2"