Perhaps the bundler prerelease is the reason we're running specs twice? Let's see.

This commit is contained in:
Sarah Mei 2011-12-05 20:20:48 -08:00
parent 0d41c9c5f3
commit df06b04d83
3 changed files with 2 additions and 3 deletions

View file

@ -11,7 +11,6 @@ env:
- DB=postgres BUILD_TYPE=other - DB=postgres BUILD_TYPE=other
- DB=mysql BUILD_TYPE=other - DB=mysql BUILD_TYPE=other
before_install: gem install bundler --pre
bundler_args: "--without development production" bundler_args: "--without development production"
before_script: "./config/ci/before-travis.sh" before_script: "./config/ci/before-travis.sh"
script: "bundle exec rake travis" script: "bundle exec rake travis"

View file

@ -7,7 +7,7 @@ namespace :ci do
system("export DISPLAY=:99.0 && bundle exec rake cucumber") system("export DISPLAY=:99.0 && bundle exec rake cucumber")
raise "Cucumber failed!" unless $?.exitstatus == 0 raise "Cucumber failed!" unless $?.exitstatus == 0
else else
["rake spec:fixtures", "rake spec", "rake jasmine:ci"].each do |cmd| ["rake generate_fixtures", "rake spec", "rake jasmine:ci"].each do |cmd|
puts "Running #{cmd}..." puts "Running #{cmd}..."
system("export DISPLAY=:99.0 && bundle exec #{cmd}") system("export DISPLAY=:99.0 && bundle exec #{cmd}")
raise "#{cmd} failed!" unless $?.exitstatus == 0 raise "#{cmd} failed!" unless $?.exitstatus == 0

View file

@ -16,7 +16,7 @@ begin
RSpec::Core::RakeTask.new(:spec => spec_prereq) RSpec::Core::RakeTask.new(:spec => spec_prereq)
desc "Run all specs that generate fixtures for rspec or jasmine" desc "Run all specs that generate fixtures for rspec or jasmine"
RSpec::Core::RakeTask.new(:'spec:fixtures' => spec_prereq) do |t| RSpec::Core::RakeTask.new(:generate_fixtures => spec_prereq) do |t|
t.rspec_opts = ['--tag fixture'] t.rspec_opts = ['--tag fixture']
end end