test.rb, dev.rb, and production.rb just reopen the Application class; no more hax required
This commit is contained in:
parent
a110ff0fca
commit
b0b4ae970c
|
@ -9,7 +9,13 @@ module Rails
|
|||
end
|
||||
|
||||
def new
|
||||
@instance ||= super
|
||||
@instance ||= begin
|
||||
begin
|
||||
require config.environment_path
|
||||
rescue LoadError
|
||||
end
|
||||
super
|
||||
end
|
||||
end
|
||||
|
||||
def config
|
||||
|
@ -119,23 +125,6 @@ module Rails
|
|||
@app.call(env)
|
||||
end
|
||||
|
||||
|
||||
# Loads the environment specified by Configuration#environment_path, which
|
||||
# is typically one of development, test, or production.
|
||||
initializer :load_environment do
|
||||
next unless File.file?(config.environment_path)
|
||||
|
||||
config = self.config
|
||||
|
||||
Kernel.class_eval do
|
||||
meth = instance_method(:config) if Object.respond_to?(:config)
|
||||
define_method(:config) { config }
|
||||
require config.environment_path
|
||||
remove_method :config
|
||||
define_method(:config, &meth) if meth
|
||||
end
|
||||
end
|
||||
|
||||
# Set the <tt>$LOAD_PATH</tt> based on the value of
|
||||
# Configuration#load_paths. Duplicates are removed.
|
||||
initializer :set_load_path do
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
# Settings specified here will take precedence over those in config/environment.rb
|
||||
|
||||
# In the development environment your application's code is reloaded on
|
||||
# every request. This slows down response time but is perfect for development
|
||||
# since you don't have to restart the webserver when you make code changes.
|
||||
config.cache_classes = false
|
||||
|
||||
# Log error messages when you accidentally call methods on nil.
|
||||
config.whiny_nils = true
|
||||
|
||||
# Show full error reports and disable caching
|
||||
config.action_controller.consider_all_requests_local = true
|
||||
config.action_view.debug_rjs = true
|
||||
config.action_controller.perform_caching = false
|
||||
|
||||
# Don't care if the mailer can't send
|
||||
config.action_mailer.raise_delivery_errors = false
|
|
@ -0,0 +1,19 @@
|
|||
class <%= app_const %>
|
||||
# Settings specified here will take precedence over those in config/environment.rb
|
||||
|
||||
# In the development environment your application's code is reloaded on
|
||||
# every request. This slows down response time but is perfect for development
|
||||
# since you don't have to restart the webserver when you make code changes.
|
||||
config.cache_classes = false
|
||||
|
||||
# Log error messages when you accidentally call methods on nil.
|
||||
config.whiny_nils = true
|
||||
|
||||
# Show full error reports and disable caching
|
||||
config.action_controller.consider_all_requests_local = true
|
||||
config.action_view.debug_rjs = true
|
||||
config.action_controller.perform_caching = false
|
||||
|
||||
# Don't care if the mailer can't send
|
||||
config.action_mailer.raise_delivery_errors = false
|
||||
end
|
|
@ -1,31 +0,0 @@
|
|||
# Settings specified here will take precedence over those in config/environment.rb
|
||||
|
||||
# The production environment is meant for finished, "live" apps.
|
||||
# Code is not reloaded between requests
|
||||
config.cache_classes = true
|
||||
|
||||
# Full error reports are disabled and caching is turned on
|
||||
config.action_controller.consider_all_requests_local = false
|
||||
config.action_controller.perform_caching = true
|
||||
|
||||
# See everything in the log (default is :info)
|
||||
# config.log_level = :debug
|
||||
|
||||
# Use a different logger for distributed setups
|
||||
# config.logger = SyslogLogger.new
|
||||
|
||||
# Use a different cache store in production
|
||||
# config.cache_store = :mem_cache_store
|
||||
|
||||
# Disable Rails's static asset server
|
||||
# In production, Apache or nginx will already do this
|
||||
config.serve_static_assets = false
|
||||
|
||||
# Enable serving of images, stylesheets, and javascripts from an asset server
|
||||
# config.action_controller.asset_host = "http://assets.example.com"
|
||||
|
||||
# Disable delivery errors, bad email addresses will be ignored
|
||||
# config.action_mailer.raise_delivery_errors = false
|
||||
|
||||
# Enable threaded mode
|
||||
# config.threadsafe!
|
|
@ -0,0 +1,33 @@
|
|||
class <%= app_const %>
|
||||
# Settings specified here will take precedence over those in config/environment.rb
|
||||
|
||||
# The production environment is meant for finished, "live" apps.
|
||||
# Code is not reloaded between requests
|
||||
config.cache_classes = true
|
||||
|
||||
# Full error reports are disabled and caching is turned on
|
||||
config.action_controller.consider_all_requests_local = false
|
||||
config.action_controller.perform_caching = true
|
||||
|
||||
# See everything in the log (default is :info)
|
||||
# config.log_level = :debug
|
||||
|
||||
# Use a different logger for distributed setups
|
||||
# config.logger = SyslogLogger.new
|
||||
|
||||
# Use a different cache store in production
|
||||
# config.cache_store = :mem_cache_store
|
||||
|
||||
# Disable Rails's static asset server
|
||||
# In production, Apache or nginx will already do this
|
||||
config.serve_static_assets = false
|
||||
|
||||
# Enable serving of images, stylesheets, and javascripts from an asset server
|
||||
# config.action_controller.asset_host = "http://assets.example.com"
|
||||
|
||||
# Disable delivery errors, bad email addresses will be ignored
|
||||
# config.action_mailer.raise_delivery_errors = false
|
||||
|
||||
# Enable threaded mode
|
||||
# config.threadsafe!
|
||||
end
|
|
@ -1,27 +0,0 @@
|
|||
# Settings specified here will take precedence over those in config/environment.rb
|
||||
|
||||
# The test environment is used exclusively to run your application's
|
||||
# test suite. You never need to work with it otherwise. Remember that
|
||||
# your test database is "scratch space" for the test suite and is wiped
|
||||
# and recreated between test runs. Don't rely on the data there!
|
||||
config.cache_classes = true
|
||||
|
||||
# Log error messages when you accidentally call methods on nil.
|
||||
config.whiny_nils = true
|
||||
|
||||
# Show full error reports and disable caching
|
||||
config.action_controller.consider_all_requests_local = true
|
||||
config.action_controller.perform_caching = false
|
||||
|
||||
# Disable request forgery protection in test environment
|
||||
config.action_controller.allow_forgery_protection = false
|
||||
|
||||
# Tell Action Mailer not to deliver emails to the real world.
|
||||
# The :test delivery method accumulates sent emails in the
|
||||
# ActionMailer::Base.deliveries array.
|
||||
config.action_mailer.delivery_method = :test
|
||||
|
||||
# Use SQL instead of Active Record's schema dumper when creating the test database.
|
||||
# This is necessary if your schema can't be completely dumped by the schema dumper,
|
||||
# like if you have constraints or database-specific column types
|
||||
# config.active_record.schema_format = :sql
|
|
@ -0,0 +1,29 @@
|
|||
class <%= app_const %>
|
||||
# Settings specified here will take precedence over those in config/environment.rb
|
||||
|
||||
# The test environment is used exclusively to run your application's
|
||||
# test suite. You never need to work with it otherwise. Remember that
|
||||
# your test database is "scratch space" for the test suite and is wiped
|
||||
# and recreated between test runs. Don't rely on the data there!
|
||||
config.cache_classes = true
|
||||
|
||||
# Log error messages when you accidentally call methods on nil.
|
||||
config.whiny_nils = true
|
||||
|
||||
# Show full error reports and disable caching
|
||||
config.action_controller.consider_all_requests_local = true
|
||||
config.action_controller.perform_caching = false
|
||||
|
||||
# Disable request forgery protection in test environment
|
||||
config.action_controller.allow_forgery_protection = false
|
||||
|
||||
# Tell Action Mailer not to deliver emails to the real world.
|
||||
# The :test delivery method accumulates sent emails in the
|
||||
# ActionMailer::Base.deliveries array.
|
||||
config.action_mailer.delivery_method = :test
|
||||
|
||||
# Use SQL instead of Active Record's schema dumper when creating the test database.
|
||||
# This is necessary if your schema can't be completely dumped by the schema dumper,
|
||||
# like if you have constraints or database-specific column types
|
||||
# config.active_record.schema_format = :sql
|
||||
end
|
|
@ -7,16 +7,15 @@ module InitializerTests
|
|||
def setup
|
||||
build_app
|
||||
boot_rails
|
||||
require "rails"
|
||||
end
|
||||
|
||||
# test_config_defaults_and_settings_should_be_added_to_i18n_defaults
|
||||
test "i18n config defaults and settings should be added to i18n defaults" do
|
||||
Rails::Initializer.run do |c|
|
||||
c.root = app_path
|
||||
c.i18n.load_path << "my/other/locale.yml"
|
||||
end
|
||||
Rails.initialize!
|
||||
add_to_config <<-RUBY
|
||||
config.root = "#{app_path}"
|
||||
config.i18n.load_path << "my/other/locale.yml"
|
||||
RUBY
|
||||
require "#{app_path}/config/environment"
|
||||
|
||||
#{RAILS_FRAMEWORK_ROOT}/railties/test/fixtures/plugins/engines/engine/config/locales/en.yml
|
||||
assert_equal %W(
|
||||
|
|
|
@ -7,14 +7,14 @@ class PathsTest < Test::Unit::TestCase
|
|||
build_app
|
||||
boot_rails
|
||||
require "rails"
|
||||
Rails::Initializer.run do |config|
|
||||
config.root = app_path
|
||||
add_to_config <<-RUBY
|
||||
config.root = "#{app_path}"
|
||||
config.frameworks = [:action_controller, :action_view, :action_mailer, :active_record]
|
||||
config.after_initialize do
|
||||
ActionController::Base.session_store = nil
|
||||
end
|
||||
end
|
||||
Rails.initialize!
|
||||
RUBY
|
||||
require "#{app_path}/config/environment"
|
||||
@paths = Rails.application.config.paths
|
||||
end
|
||||
|
||||
|
|
|
@ -89,6 +89,13 @@ module TestHelpers
|
|||
end
|
||||
end
|
||||
|
||||
routes = File.read("#{app_path}/config/routes.rb")
|
||||
if routes =~ /(\n\s*end\s*)\Z/
|
||||
File.open("#{app_path}/config/routes.rb", 'w') do |f|
|
||||
f.puts $` + "\nmatch ':controller(/:action(/:id))(.:format)'\n" + $1
|
||||
end
|
||||
end
|
||||
|
||||
add_to_config 'config.action_controller.session = { :key => "_myapp_session", :secret => "bac838a849c1d5c4de2e6a50af826079" }'
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue