Skip to content

Commit

Permalink
fixes an intermittent issue where jetty port wouldnt set correctly un…
Browse files Browse the repository at this point in the history
…less RAILS_ENV was passed in
  • Loading branch information
mejackreed committed Mar 2, 2015
1 parent 222d528 commit 0f5866a
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,22 @@ task :fixtures => ['engine_cart:generate'] do
end

desc "Execute Continuous Integration build"
task :ci => ['engine_cart:generate', 'jetty:clean', 'geoblacklight:configure_solr'] do
ENV['environment'] = "test"
jetty_params = Jettywrapper.load_config
jetty_params[:startup_wait]= 60

Jettywrapper.wrap(jetty_params) do
Rake::Task["fixtures"].invoke

# run the tests
Rake::Task["spec"].invoke
task :ci do
if Rails.env.test?
Rake::Task['engine_cart:generate'].invoke
Rake::Task['jetty:clean'].invoke
Rake::Task['geoblacklight:configure_solr'].invoke
ENV['environment'] = "test"
jetty_params = Jettywrapper.load_config
jetty_params[:startup_wait]= 60

Jettywrapper.wrap(jetty_params) do
Rake::Task["fixtures"].invoke

# run the tests
Rake::Task["spec"].invoke
end
else
system('rake ci RAILS_ENV=test')
end
end

0 comments on commit 0f5866a

Please sign in to comment.