Reload I18n locales in development

2 files changed, 86 insertions, 0 deletions

diff --git a/railties/test/application/initializers/i18n_test.rb b/railties/test/application/initializers/i18n_test.rb
index 9ee54796a4..ab7f29b0f2 100644
--- a/railties/test/application/initializers/i18n_test.rb
+++ b/railties/test/application/initializers/i18n_test.rb
@@ -132,6 +132,79 @@ en:
       assert_equal "2", last_response.body
     end
 
+    test "new locale files are loaded" do
+      add_to_config <<-RUBY
+        config.cache_classes = false
+      RUBY
+
+      app_file "config/locales/en.yml", <<-YAML
+en:
+  foo: "1"
+      YAML
+
+      app_file 'config/routes.rb', <<-RUBY
+        Rails.application.routes.draw do
+          get '/i18n',   :to => lambda { |env| [200, {}, [I18n.t(:foo)]] }
+        end
+      RUBY
+
+      require 'rack/test'
+      extend Rack::Test::Methods
+      load_app
+
+      get "/i18n"
+      assert_equal "1", last_response.body
+
+      # Wait a full second so we have time for changes to propagate
+      sleep(1)
+
+      remove_file "config/locales/en.yml"
+      app_file "config/locales/custom.en.yml", <<-YAML
+en:
+  foo: "2"
+      YAML
+
+      get "/i18n"
+      assert_equal "2", last_response.body
+    end
+
+    test "I18n.load_path is reloaded" do
+      add_to_config <<-RUBY
+        config.cache_classes = false
+      RUBY
+
+      app_file "config/locales/en.yml", <<-YAML
+en:
+  foo: "1"
+      YAML
+
+      app_file 'config/routes.rb', <<-RUBY
+        Rails.application.routes.draw do
+          get '/i18n',   :to => lambda { |env| [200, {}, [I18n.load_path.inspect]] }
+        end
+      RUBY
+
+      require 'rack/test'
+      extend Rack::Test::Methods
+      load_app
+
+      get "/i18n"
+
+      assert_match "en.yml", last_response.body
+
+      # Wait a full second so we have time for changes to propagate
+      sleep(1)
+
+      app_file "config/locales/fr.yml", <<-YAML
+fr:
+  foo: "2"
+      YAML
+
+      get "/i18n"
+      assert_match "fr.yml", last_response.body
+      assert_match "en.yml", last_response.body
+    end
+
     # Fallbacks
     test "not using config.i18n.fallbacks does not initialize I18n.fallbacks" do
       I18n.backend = Class.new(I18n::Backend::Simple).new
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
index 12630e4d01..96b54c7264 100644
--- a/railties/test/paths_test.rb
+++ b/railties/test/paths_test.rb
@@ -62,6 +62,13 @@ class PathsTest < ActiveSupport::TestCase
     assert_equal ["/foo/bar/baz"], @root["app/models"].to_a
   end
 
+  test "absolute current path" do
+    @root.add "config"
+    @root.add "config/locales"
+
+    assert_equal "/foo/bar/config/locales", @root["config/locales"].absolute_current
+  end
+
   test "adding multiple physical paths as an array" do
     @root.add "app", with: ["/app", "/app2"]
     assert_equal ["/app", "/app2"], @root["app"].to_a
@@ -215,6 +222,12 @@ class PathsTest < ActiveSupport::TestCase
     assert_equal "*.rb", @root["app"].glob
   end
 
+  test "it should be possible to get extensions by glob" do
+    @root["app"] = "/app"
+    @root["app"].glob = "*.{rb,yml}"
+    assert_equal ["rb", "yml"], @root["app"].extensions
+  end
+
   test "it should be possible to override a path's default glob without assignment" do
     @root.add "app", with: "/app", glob: "*.rb"
     assert_equal "*.rb", @root["app"].glob