Commit df06b04d authored by Sarah Mei's avatar Sarah Mei

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

parent 0d41c9c5
......@@ -11,7 +11,6 @@ env:
- DB=postgres BUILD_TYPE=other
- DB=mysql BUILD_TYPE=other
before_install: gem install bundler --pre
bundler_args: "--without development production"
before_script: "./config/ci/before-travis.sh"
script: "bundle exec rake travis"
......
......@@ -7,7 +7,7 @@ namespace :ci do
system("export DISPLAY=:99.0 && bundle exec rake cucumber")
raise "Cucumber failed!" unless $?.exitstatus == 0
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}..."
system("export DISPLAY=:99.0 && bundle exec #{cmd}")
raise "#{cmd} failed!" unless $?.exitstatus == 0
......
......@@ -16,7 +16,7 @@ begin
RSpec::Core::RakeTask.new(:spec => spec_prereq)
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']
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment