Permalink
Browse files

improvements for travis

  • Loading branch information...
1 parent bbd6632 commit eddc781dd0563157be202185705a06beb56de343 @mrbrdo committed Jun 7, 2012
Showing with 5 additions and 11 deletions.
  1. +1 −1 .travis.yml
  2. +0 −3 Gemfile.lock
  3. +4 −6 Rakefile
  4. +0 −1 has_moderated.gemspec
View
@@ -3,7 +3,7 @@ branches:
only:
- master
before_script:
- - "cd test/dummy && rake db:schema:load && rake db:test:prepare && cd ../.."
+ - "rake prepare_test_env"
rvm:
- 1.8.7
- ree
View
@@ -86,8 +86,6 @@ GEM
activesupport (= 3.2.5)
bundler (~> 1.0)
railties (= 3.2.5)
- rails3-generators (0.17.4)
- railties (>= 3.0.0)
railties (3.2.5)
actionpack (= 3.2.5)
activesupport (= 3.2.5)
@@ -140,7 +138,6 @@ DEPENDENCIES
guard-spork
has_moderated!
pry
- rails3-generators
rmagick
rspec
rspec-rails
View
@@ -24,15 +24,13 @@ Bundler::GemHelper.install_tasks
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec) do |spec|
+ spec.rspec_opts = %w(--color)
spec.pattern = 'test/dummy/spec{,/*/**}/*_spec.rb'
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
+task :prepare_test_env do
+ puts "Preparing test environment..."
+ system("cd test/dummy && RAILS_ENV=test rake db:schema:load") # db:test:prepare
end
-=end
task :default => [:spec]
View
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
s.add_development_dependency "sqlite3"
s.add_development_dependency 'rspec'
s.add_development_dependency 'rspec-rails'
- s.add_development_dependency 'rails3-generators'
s.add_development_dependency 'pry'
s.add_development_dependency 'rmagick'

0 comments on commit eddc781

Please sign in to comment.