0
@@ -179,12 +179,15 @@ namespace :db do
0
   end
0
 
0
   namespace :fixtures do
0
-    desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
0
+    desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
0
     task :load => :environment do
0
       require 'active_record/fixtures'
0
-      ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
0
-      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
0
-        Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*'))
0
+      ActiveRecord::Base.establish_connection(Rails.env)
0
+      base_dir = File.join(Rails.root, 'test', 'fixtures')
0
+      fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
0
+
0
+      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
0
+        Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
0
       end
0
     end
0