diff options
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG | 5 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 | ||||
-rw-r--r-- | railties/test/application/rackup_test.rb | 2 | ||||
-rw-r--r-- | railties/test/railties/i18n_railtie_test.rb | 17 |
4 files changed, 17 insertions, 9 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index a326e29d27..1d76c77ade 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,3 +1,8 @@ +*Rails 3.0.0 [beta 4/release candidate] (unreleased)* + +* Version bump + + *Rails 3.0.0 [beta 3] (April 13th, 2010)* * Renamed config.cookie_secret to config.secret_token and pass it as env key. [JV] diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index ee44acc2fa..cd4a3dce4e 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -17,7 +17,7 @@ module Rails private %w(template copy_file directory empty_directory inside empty_directory_with_gitkeep create_file chmod shebang).each do |method| - class_eval <<-RUBY + class_eval <<-RUBY, __FILE__, __LINE__ + 1 def #{method}(*args, &block) @generator.send(:#{method}, *args, &block) end diff --git a/railties/test/application/rackup_test.rb b/railties/test/application/rackup_test.rb index 3790de721c..863950c04f 100644 --- a/railties/test/application/rackup_test.rb +++ b/railties/test/application/rackup_test.rb @@ -35,7 +35,7 @@ module ApplicationTests # keep it working for now test "deprecated ActionController::Dispatcher still works" do rackup - assert_kind_of? Rails::Application, ActionController::Dispatcher.new + assert_kind_of Rails::Application, ActionController::Dispatcher.new end test "the config object is available on the application object" do diff --git a/railties/test/railties/i18n_railtie_test.rb b/railties/test/railties/i18n_railtie_test.rb index 51684aa838..2b1950b3d5 100644 --- a/railties/test/railties/i18n_railtie_test.rb +++ b/railties/test/railties/i18n_railtie_test.rb @@ -9,12 +9,6 @@ module RailtiesTest boot_rails FileUtils.rm_rf("#{app_path}/config/environments") require "rails/all" - @old_path = I18n.load_path - end - - def teardown - I18n.load_path = @old_path || [] - I18n.backend = nil end def load_app @@ -42,7 +36,7 @@ module RailtiesTest end test "not using config.i18n.fallbacks does not initialize I18n.fallbacks" do - I18n.backend = Class.new { include I18n::Backend::Base }.new # can't uninclude modules, so use a tmp backend class + I18n.backend = Class.new { include I18n::Backend::Base }.new load_app assert_no_fallbacks end @@ -50,6 +44,15 @@ module RailtiesTest test "config.i18n.fallbacks = true initializes I18n.fallbacks with default settings" do I18n::Railtie.config.i18n.fallbacks = true load_app + assert I18n.backend.class.included_modules.include?(I18n::Backend::Fallbacks) + assert_fallbacks :de => [:de, :en] + end + + test "config.i18n.fallbacks = true initializes I18n.fallbacks with default settings even when backend changes" do + I18n::Railtie.config.i18n.fallbacks = true + I18n::Railtie.config.i18n.backend = Class.new { include I18n::Backend::Base }.new + load_app + assert I18n.backend.class.included_modules.include?(I18n::Backend::Fallbacks) assert_fallbacks :de => [:de, :en] end |