Merge pull request #23 from phpcr/relative_path_and_command_reorg

Relative path and command reorg

Author: dantleech

.travis.yml

@@ -13,3 +13,4 @@ before_script:
 script: 
   - phpunit --coverage-text
   - php vendor/behat/behat/bin/behat
+  - php vendor/bin/phpspec run

composer.json

@@ -14,7 +14,8 @@
         "symfony/process": "2.3.*",
         "symfony/filesystem": "2.3.*",
         "phpunit/phpunit": "~3.7.28",
-        "behat/behat": "~2.5"
+        "behat/behat": "~2.5",
+        "phpspec/phpspec": "2.0"
     },
     "license": "MIT",
     "authors": [

features/workspace_node_clone.feature renamed to features/node_clone.feature

@@ -12,19 +12,19 @@ Feature: Clone a node from a given workspace to the current workspace
 
     Scenario: Clone node
         Given the current workspace is "default"
-        And I execute the "workspace:node:clone default_1 /cms/articles/article1 /cms/clone" command
+        And I execute the "node:clone /cms/articles/article1 /cms/clone default_1" 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
+        Given I execute the "node:clone /cms/articles/article1 /cms/articles default_1" 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
+        Given I execute the "node:clone --remove-existing /cms/articles/article1 /cms/articles/article1 default_1" command
         Then the command should not fail

features/workspace_node_copy.feature renamed to features/node_copy.feature

@@ -11,12 +11,12 @@ Feature: Copy a node from a given workspace to the current workspace
         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 default_1" command
+        Given I execute the "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 /tests_general_base/index.txt.2" command
+        Given I execute the "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 "/tests_general_base/index.txt.2"

features/node_corresponding.feature

@@ -11,9 +11,9 @@ Feature: Display the path of any corresponding node in a given workspace
         And the "session_data.xml" fixtures are loaded
         And the current workspace is "default"
 
-    Scenario: Rename a node
+    Scenario: Show corresponding nodes
         Given the current node is "/tests_general_base/idExample"
-        And I execute the "node:corresponding default" command
+        And I execute the "node:corresponding . default" command
         Then the command should not fail
         And I should see the following:
         """

features/node_definition.feature

@@ -9,7 +9,7 @@ Feature: Show CND for node
 
     Scenario: Show node definition
         Given the current node is "/tests_general_base"
-        And I execute the "node:definition --no-ansi" command
+        And I execute the "node:definition daniel --no-ansi" command
         Then the command should fail
         And I should see the following:
         """

features/node_info.feature

@@ -9,12 +9,12 @@ Feature: Show information about node
 
     Scenario: Show node information
         Given the current node is "/tests_general_base"
-        And I execute the "node:info --no-ansi" command
+        And I execute the "node:info daniel --no-ansi" command
         Then the command should not fail
         And I should see the following:
         """
         +-------------------+--------------------------------------+
-        | Path              | /tests_general_base                  |
+        | Path              | /tests_general_base/daniel           |
         | UUID              | N/A                                  |
         | Index             | 1                                    |
         | Primary node type | nt:unstructured                      |

features/node_lifecycle_follow_transition.feature

@@ -9,7 +9,7 @@ Feature: Follow the given lifecycle transition on the current node
 
     Scenario: Follow lifecycle transition
         Given the current node is "/tests_general_base"
-        And I execute the "node:lifecycle:follow foo" command
+        And I execute the "node:lifecycle:follow daniel foo" command
         Then the command should fail
         And I should see the following:
         """

features/node_lifecycle_list.feature

@@ -9,7 +9,7 @@ Feature: List the possible lifecycle transitions for the current node
 
     Scenario: List possible lifecycle transitions
         Given the current node is "/tests_general_base"
-        And I execute the "node:lifecycle:list" command
+        And I execute the "node:lifecycle:list daniel" command
         Then the command should fail
         And I should see the following:
         """

features/node_mixin_add.feature

@@ -9,7 +9,7 @@ Feature: Add mixin to the current node
 
     Scenario: Add a mixin to the current node
         Given the current node is "/tests_general_base"
-        And I execute the "node:mixin:add mix:versionable --no-ansi" command
+        And I execute the "node:mixin:add . mix:versionable --no-ansi" command
         And I save the session
         Then the command should not fail
         And the node at "/tests_general_base" should have the mixin "mix:versionable"