Permalink
Browse files

update travis config

  • Loading branch information...
1 parent d69ed84 commit bbd6632afeedbe74e798addf129965f84b02af48 @mrbrdo committed Jun 7, 2012
Showing with 3 additions and 4 deletions.
  1. +1 −2 .travis.yml
  2. +2 −2 Rakefile
View
@@ -2,9 +2,8 @@ language: ruby
branches:
only:
- master
- - travis
before_script:
- - "cd test/dummy && rake db:schema:load && rake db:test:prepare"
+ - "cd test/dummy && rake db:schema:load && rake db:test:prepare && cd ../.."
rvm:
- 1.8.7
- ree
View
@@ -22,17 +22,17 @@ end
Bundler::GemHelper.install_tasks
-=begin
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec) do |spec|
spec.pattern = 'test/dummy/spec{,/*/**}/*_spec.rb'
end
-=end
+=begin
task :spec do
puts "Running RSpec tests in test/dummy/spec..."
system("export DISPLAY=:99.0 && cd test/dummy && bundle exec rspec spec")
raise "RSpec tests failed!" unless $?.exitstatus == 0
end
+=end
task :default => [:spec]

0 comments on commit bbd6632

Please sign in to comment.