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

@@ -22,14 +22,15 @@
     modules.each { |mod| require "#{mod}/railtie" }
 
     Bundler.require :default, Rails.env
 
     Combustion::Application.configure_for_combustion
-    Combustion::Application.initialize!
 
     if modules.map(&:to_s).include? 'active_record'
       Combustion::Database.setup
     end
+
+    Combustion::Application.initialize!
 
     RSpec.configure do |config|
       include_capybara_into config
 
       config.include Combustion::Application.routes.url_helpers