merb_framework.rb in royw-railroad_xing-0.5.0.2

- old
+ new

@@ -12,10 +12,13 @@
   
   # enter the merb 'test' environment
   def initialize
     require 'merb-core'
     Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
-    DataMapper.auto_migrate!
+    case Merb::Config[:merb_orm]
+      when :datamapper: DataMapper.auto_migrate!
+      when :activerecord: ActiveRecord::Migrator.migrate(File.expand_path(File.dirname(__FILE__) + "/schema/migrations"))
+    end
     @name = 'Merb'
     @migration_version = nil
   end
   
   # is the given class a subclass of the application controller?