diff --git a/features/rake_clean.feature b/features/rake_clean.feature index 9acd592f6..f9c2ffa33 100644 --- a/features/rake_clean.feature +++ b/features/rake_clean.feature @@ -4,17 +4,13 @@ Feature: Rake works in the suspended project Scenario: Running rake in the suspended project When I suspend a project called "test_project" And I cd to the "test_project" root - When I drop and create the required databases - And I run the rake task "db:create" - And I run the rake task "db:migrate" - And I run the rake task "db:test:prepare" - And I run rake - Then I see a successful response in the shell + And I drop and create the required databases + Then I can cleanly rake the project Scenario: Making a spec then running rake - When I drop and create the required databases - And I suspend a project called "test_project" + When I suspend a project called "test_project" And I generate "model post title:string" + And I drop and create the required databases And I run the rake task "db:migrate" And I run the rake task "db:test:prepare" And I run the rake task "spec" diff --git a/features/step_definitions/suspenders_steps.rb b/features/step_definitions/suspenders_steps.rb index e7a335c2d..884c9f8b6 100644 --- a/features/step_definitions/suspenders_steps.rb +++ b/features/step_definitions/suspenders_steps.rb @@ -55,7 +55,7 @@ And I run the rake task "db:create" And I run the rake task "db:migrate" And I run the rake task "db:test:prepare" - And I run the rake task "cucumber" + And I run rake Then I see a successful response in the shell } end diff --git a/lib/suspenders/app_builder.rb b/lib/suspenders/app_builder.rb index 04059be59..97ddc8b26 100644 --- a/lib/suspenders/app_builder.rb +++ b/lib/suspenders/app_builder.rb @@ -150,24 +150,7 @@ def generate_rspec def configure_capybara_webkit append_file 'spec/spec_helper.rb' do - "\n Capybara.javascript_driver = :webkit" - end - end - - def generate_cucumber(options = {}) - generate 'cucumber:install', '--rspec', '--capybara' - inject_into_file 'config/cucumber.yml', - ' -drb -r features', - :after => %{default: <%= std_opts %> features} - copy_file 'features_support_env.rb', - 'features/support/env.rb', - :force => true - prepend_file 'features/support/env.rb', simplecov_init - - if options[:webkit] - inject_into_file 'features/support/env.rb', - "\n Capybara.javascript_driver = :webkit", - :after => /Capybara.default_selector = :css/ + "\nCapybara.javascript_driver = :webkit" end end