Commit db412c1391fbbd31bae323ae68bd266366c6e830
1 parent
654b1e0f
Exists in
master
and in
22 other branches
Use new override method for running solr with cucumber
Showing
1 changed file
with
2 additions
and
15 deletions
Show diff stats
lib/tasks/cucumber.rake
| @@ -11,13 +11,6 @@ begin | @@ -11,13 +11,6 @@ begin | ||
| 11 | vendored_cucumber_binary = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first | 11 | vendored_cucumber_binary = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first |
| 12 | 12 | ||
| 13 | namespace :cucumber do | 13 | namespace :cucumber do |
| 14 | - task :solr_start do | ||
| 15 | - ENV['RAILS_ENV'] = 'cucumber' | ||
| 16 | - Rake::Task['solr:stop'].invoke | ||
| 17 | - Rake::Task['solr:download'].invoke | ||
| 18 | - Rake::Task['solr:start'].invoke | ||
| 19 | - end | ||
| 20 | - | ||
| 21 | Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t| | 14 | Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t| |
| 22 | t.binary = vendored_cucumber_binary | 15 | t.binary = vendored_cucumber_binary |
| 23 | t.fork = true # You may get faster startup if you set this to false | 16 | t.fork = true # You may get faster startup if you set this to false |
| @@ -36,17 +29,11 @@ begin | @@ -36,17 +29,11 @@ begin | ||
| 36 | t.cucumber_opts = "--color -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" | 29 | t.cucumber_opts = "--color -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" |
| 37 | end | 30 | end |
| 38 | 31 | ||
| 39 | - task :solr_stop do | ||
| 40 | - ENV['RAILS_ENV'] = 'cucumber' | ||
| 41 | - Rake::Task['solr:stop'].invoke | ||
| 42 | - end | ||
| 43 | - | ||
| 44 | desc 'Run all features' | 32 | desc 'Run all features' |
| 45 | - task :all => [:solr_start, :ok, :wip, :solr_stop] do | ||
| 46 | - end | 33 | + task :all => [:ok, :wip] |
| 47 | end | 34 | end |
| 48 | desc 'Alias for cucumber:ok' | 35 | desc 'Alias for cucumber:ok' |
| 49 | - task :cucumber => ['cucumber:solr_start', 'cucumber:ok', 'cucumber:solr_stop'] | 36 | + task :cucumber => ['cucumber:ok'] |
| 50 | 37 | ||
| 51 | task :features => :cucumber do | 38 | task :features => :cucumber do |
| 52 | STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***" | 39 | STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***" |