Housekeeping: Creating a project example is more correct. Features in…

… folders
despo · Jul 4, 2011 · e227de5 · e227de5
1 parent 27d9ba4
commit e227de5
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 17 deletions.
diff --git a/features/creating_a_new_project.feature b/features/creating_a_new_project.feature
@@ -5,20 +5,7 @@ Feature: Creating a New Project
 
   Scenario: Set up your project and verify that you can use CukeSalad
     Given you are a Step Free Cuker
-    And   you were able to create directories: as follows
+    And   you were able to interactively run, the command 'cukesalad' and type 'y'
-    """
-    features
-    features/lib
-    features/lib/roles
-    features/lib/tasks
-    features/support
-    """
-    And you were able to create a file: at 'features/support/env.rb' containing
-      """
-      $:.unshift(File.dirname(__FILE__) + "/../../../../lib") #where to find CukeSalad
-             
-      require "cukesalad"
-      """
     And you were able to create a file: at 'features/hello_cukesalad.feature' containing
       """
       Feature: Hello CukeSalad
@@ -31,4 +18,4 @@ Feature: Creating a New Project
     """
     CukeSalad says: Hello!!
     """
-   And  you should see it has 'passed'
+    And  you should see it has 'passed'
diff --git a/features/define_a_role.feature → ...ures/defining_roles/define_a_role.feature b/features/define_a_role.feature → ...ures/defining_roles/define_a_role.feature
diff --git a/...es/prepare_the_actor_for_the_role.feature → ...es/prepare_the_actor_for_the_role.feature b/...es/prepare_the_actor_for_the_role.feature → ...es/prepare_the_actor_for_the_role.feature
diff --git a/features/define_a_task.feature → ...ures/defining_tasks/define_a_task.feature b/features/define_a_task.feature → ...ures/defining_tasks/define_a_task.feature
diff --git a/...ures/define_a_task_with_arguments.feature → ...asks/define_a_task_with_arguments.feature b/...ures/define_a_task_with_arguments.feature → ...asks/define_a_task_with_arguments.feature
diff --git a/features/expressing_expectations.feature → ...ectations/expressing_expectations.feature b/features/expressing_expectations.feature → ...ectations/expressing_expectations.feature
diff --git a/features/lib/tasks/interactively_run.rb b/features/lib/tasks/interactively_run.rb
@@ -0,0 +1,5 @@
+in_order_to "interactively run", the_command: :command, and_type: :answer do
+  @aruba_timeout_seconds = 10
+  run_interactive unescape( the :command )
+  type "#{the :answer}\n"
+end
diff --git a/lib/cukesalad/cli.rb b/lib/cukesalad/cli.rb
@@ -54,7 +54,7 @@ def create_cukesalad_structure
 
       def configure
         cd "features/support"
-        content = "require 'cukesalad'\n begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end"
+        content = "\nrequire 'cukesalad'\nbegin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end"
         append_to_file "env.rb",content
       end
 

diff --git a/spec/cukesalad/cli_spec.rb b/spec/cukesalad/cli_spec.rb
@@ -42,7 +42,7 @@ def file_content file
         end
 
         it 'env.rb has the right content' do
-          content = "require 'cukesalad'\n begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end"
+          content = "\nrequire 'cukesalad'\nbegin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end"
           file_content(file).should == content
         end
       end