fix travis for ruby 2.1 and rails 4
This commit is contained in:
parent
d91da49078
commit
7be5097a59
2 changed files with 4 additions and 2 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -30,6 +30,8 @@ test/dummy/test/fixtures/*.y*ml
|
||||||
|
|
||||||
rspec-persistance.txt
|
rspec-persistance.txt
|
||||||
|
|
||||||
|
.rake_tasks
|
||||||
|
|
||||||
# jekyll
|
# jekyll
|
||||||
docs/_site
|
docs/_site
|
||||||
docs/.sass-cache
|
docs/.sass-cache
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
if defined?(RSpec)
|
if defined?(RSpec)
|
||||||
namespace :spec do
|
namespace :spec do
|
||||||
task prepare_db: %w(db:create db:environment:set db:test:load)
|
task prepare_db: %w(db:create db:test:load)
|
||||||
task :prepare_fixtures do
|
task :prepare_fixtures do
|
||||||
ENV["NO_COVERAGE"] = "true"
|
ENV["NO_COVERAGE"] = "true"
|
||||||
Rake::Task["spec:generate_fixtures"].invoke
|
Rake::Task["spec:generate_fixtures"].invoke
|
||||||
|
|
@ -8,7 +8,7 @@ if defined?(RSpec)
|
||||||
end
|
end
|
||||||
|
|
||||||
desc "Prepare for rspec"
|
desc "Prepare for rspec"
|
||||||
task prepare: %w(prepare_db prepare_fixtures)
|
task prepare: %w(db:environment:set prepare_db prepare_fixtures)
|
||||||
|
|
||||||
desc "Run all specs that generate fixtures for rspec"
|
desc "Run all specs that generate fixtures for rspec"
|
||||||
RSpec::Core::RakeTask.new(:generate_fixtures) do |t|
|
RSpec::Core::RakeTask.new(:generate_fixtures) do |t|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue