Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion lib/combustion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,18 @@ module Configurations
def self.initialize!(*modules, &block)
self.setup_environment = block if block_given?

Rails.env ||= ENV["RAILS_ENV"] || "test"

options = modules.extract_options!
modules = AVAILABLE_MODULES if modules == [:all]
modules.each { |mod| require MODULES.fetch(mod, "#{mod}/railtie") }

Bundler.require :default, Rails.env

# intentionally required only after we load framework, to avoid recent Rails
# order-of-load warnings on initializers etc.
require "combustion/application"

Combustion::Application.configure_for_combustion
include_database modules, options
Combustion::Application.initialize!
Expand Down Expand Up @@ -93,5 +99,7 @@ def self.include_capybara_into(config)
require "combustion/configurations/action_mailer"
require "combustion/configurations/active_record"
require "combustion/configurations/active_storage"
require "combustion/application"
require "combustion/database"

# combustion/application is intentionally required lazily in #initialize!, not
# on boot to avoid recent Rails order-of-load warnings.
2 changes: 1 addition & 1 deletion lib/combustion/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require "securerandom"
require "digest"
Rails.env = ENV["RAILS_ENV"] || "test"
Rails.env ||= ENV["RAILS_ENV"] || "test"

module Combustion
class Application < Rails::Application
Expand Down
Loading