From 5a4df8005145a7c6529c4e9ed92e3f4927aa55e7 Mon Sep 17 00:00:00 2001 From: Viktar Basharymau Date: Wed, 25 Jun 2014 12:53:03 +0300 Subject: Extract `fixture_files` variable in fixtures:load rake task --- activerecord/lib/active_record/railties/databases.rake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index a293487032..816fca4f85 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -197,7 +197,13 @@ db_namespace = namespace :db do base_dir end - (ENV['FIXTURES'] ? ENV['FIXTURES'].split(',') : Dir["#{fixtures_dir}/**/*.yml"].map {|f| f[(fixtures_dir.size + 1)..-5] }).each do |fixture_file| + fixture_files = if ENV['FIXTURES'] + ENV['FIXTURES'].split(',') + else + Dir["#{fixtures_dir}/**/*.yml"].map {|f| f[(fixtures_dir.size + 1)..-5] } + end + + fixture_files.each do |fixture_file| ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, fixture_file) end end -- cgit v1.2.3