nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove default rake task's dependency on spec:fixtures for now, to see if that stops travis from running all the specs twice

Browse source
This commit is contained in:
Sarah Mei 2011-12-04 17:46:26 -08:00
parent e0a74b7806
commit 085471fb55
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/tasks/ci.rake
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", "rake jasmine:ci"].each do |cmd| ["rake spec: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

6
lib/tasks/rspec.rake
View file

@ -12,10 +12,8 @@ begin
task :stats => "spec:statsetup" task :stats => "spec:statsetup"
desc "Run all specs in spec directory (excluding those tagged performance)" desc "Run all specs in spec directory"
RSpec::Core::RakeTask.new(:spec => :'spec:fixtures') do |t| RSpec::Core::RakeTask.new(:spec => spec_prereq)
t.rspec_opts = ['--tag ~fixture --tag ~performance']
end
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(:'spec:fixtures' => spec_prereq) do |t|