lib/combustion/database.rb in combustion-0.5.1 vs lib/combustion/database.rb in combustion-0.5.2

@@ -7,15 +7,15 @@
         migrate
       end
     end
 
     def self.reset_database
+      ActiveRecord::Base.configurations = YAML.load(ERB.new(File.read("#{Rails.root}/config/database.yml")).result)
       abcs = ActiveRecord::Base.configurations
       case abcs['test']['adapter']
       when /mysql/
-        ActiveRecord::Base.establish_connection(:test)
-        ActiveRecord::Base.connection.recreate_database(abcs['test']['database'],
-          mysql_creation_options(abcs['test']))
+        drop_database(abcs['test']['database'])
+        create_database(abcs['test'])
         ActiveRecord::Base.establish_connection(:test)
       when /postgresql/
         ActiveRecord::Base.clear_active_connections!
         drop_database(abcs['test'])
         create_database(abcs['test'])