Cleaned up basic book steps

features/chapter_1/claw.feature → features/emulator/claw.feature

@@ -1,4 +1,4 @@
-Feature: Chapter1 claw
+Feature: Cargo-bot emulator claw
 
 Background: a bot exists
   Given I have a new cargobot
@@ -16,7 +16,7 @@ Scenario: Empty claw picks up crates
   And the claw is over pallet 1
   When I activate the cargobot
   Then the claw should be over pallet 2
-  And the claw should hold a red box
+  And the claw should hold a red crate
   And the pallets should be [[blue],[]]
 
 Scenario: Claw with crate sets it down

features/chapter_1/conditional.feature → features/emulator/conditional.feature

@@ -1,4 +1,4 @@
-Feature: Chapter 1 conditionals
+Feature: Cargo-bot emulator conditionals
 
 Background: a bot exists
   Given I have a new cargobot
@@ -27,4 +27,4 @@ Scenario: 'none' filters
   And the pallets are [[],[red],[],[blue,red]]
   When I activate the cargobot
   Then the pallets should be [[red], [], [], [blue,red]]
-  And the claw will not be crashed
+  And the claw should not be crashed

features/chapter_1/crashing.feature → features/emulator/crashing.feature

@@ -1,4 +1,4 @@
-Feature: Chapter 1 crashing
+Feature: Cargo-bot emulator crashing
 
 Background: a bot exists
   Given I have a new cargobot
@@ -8,15 +8,15 @@ Scenario: Crash when hitting left wall
   And the pallets are [[], [], []]
   And the claw is in position 1
   When I activate the cargobot
-  Then the claw should be in position 1
+  Then the claw should be over pallet 1
   And the step count should be 1
-  And the claw will be crashed
+  And the claw should be crashed
 
 Scenario: Crash when hitting right wall
   Given subroutine 1 is "R R R R"
   And the pallets are [[], [], []]
   And the claw is in position 1
   When I activate the cargobot
-  Then the claw should be in position 3
+  Then the claw should be over pallet 3
   And the step count should be 3
-  And the claw will be crashed
+  And the claw should be crashed

features/emulator/loading.feature

@@ -0,0 +1,24 @@
+Feature: Cargo-bot emulator loading scripts
+
+Background: a bot exists
+  Given I have a new cargobot
+
+Scenario: Start with subroutine 1
+  Given the script is "L R R R"
+  When I load the script into the bot
+  Then subroutine 1 should be "L R R R"
+  And subroutine 2 should be empty
+
+Scenario: Add tokens as indicated by prog_N
+  Given the script is "R prog_2 L prog_1 R prog_4 L"
+  When I load the script into the bot
+  Then subroutine 1 should be "R R"
+  And subroutine 2 should be "L"
+  And subroutine 3 should be empty
+  And subroutine 4 should be "L"
+
+Scenario: Return to subroutine as indicated
+  Given the script is "R prog_2 L L L L prog_1 R R"
+  When I load the script into the bot
+  Then subroutine 1 should be "R R R"
+  And subroutine 2 should be "L L L L"

features/chapter_1/solving.feature → features/emulator/solving.feature

@@ -1,4 +1,4 @@
-Feature: Chapter 1 solving
+Feature: Cargo-bot emulator solving
 
 Background: a bot exists
   Given I have a new cargobot

features/chapter_1/subroutines.feature → features/emulator/subroutines.feature

@@ -1,4 +1,4 @@
-Feature: Chapter 1 subroutines
+Feature: Cargo-bot emulator subroutines
 
 Background: a bot exists
   Given I have a new cargobot

features/chapter_1/toppling.feature → features/emulator/toppling.feature

@@ -1,4 +1,4 @@
-Feature: Chapter 1 crashing
+Feature: Cargo-bot emulator toppling
 
 Background: a bot exists
   Given I have a new cargobot
@@ -8,6 +8,6 @@ Scenario: Stacks topple when brushed
   And the pallets are [[],[red,red,red,red,red,red,red],[]]
   And the claw is in position 1
   When I activate the cargobot
-  Then the claw should be in position 2
+  Then the claw should be over pallet 2
   And the step count should be 1
-  And a stack of crates will be toppled
+  And a stack of crates should be toppled

features/chapter_1/tutorial.feature → features/emulator/tutorial.feature

@@ -1,4 +1,4 @@
-Feature: Chapter1 claw
+Feature: Cargo-bot emulator tutorial examples
 
 Background: a bot exists
   Given I have a new cargobot
@@ -9,27 +9,27 @@ Scenario: Tutorial 1
   And the goal is [[], [yellow]]
   When I activate the cargobot
   Then the pallets should be [[], [yellow]]
-  And the number of steps should be 3
-  And the number of crashes should be 0
-  And the number of topples should be 0
+  And the step count should be 3
+  And the claw should not be crashed
+  And no stacks should be toppled
 
 Scenario: Tutorial 2
   Given subroutine 1 is "claw R R R claw"
   And the pallets are [[yellow],[],[],[]]
   And the goal is [[],[],[],[yellow]]
   When I activate the cargobot
   Then the pallets should be [[],[],[],[yellow]]
-  And the number of steps should be 5
-  And the number of crashes should be 0
-  And the number of topples should be 0
-
+  And the step count should be 5
+  And the claw should not be crashed
+  And no stacks should be toppled
+  
 Scenario: Tutorial 4
   Given subroutine 1 is "call2 call2 call2 call2 R call1"
   And subroutine 2 is "claw R claw L"
   And the pallets are [[blue,red,green,yellow],[],[],[],[],[]]
   And the goal is [[],[],[],[],[],[yellow,green,red,blue]]
   When I activate the cargobot
   Then the pallets should be [[],[],[],[],[],[yellow,green,red,blue]]
-  And the number of steps should be 107
-  And the number of crashes should be 0
-  And the number of topples should be 0
+  And the step count should be 107
+  And the claw should not be crashed
+  And no stacks should be toppled