Ensure user set load paths have higher preference and move Bootstrap inside Application.

2 files changed, 2 insertions, 2 deletions

diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index 205840360c..6686d82f19 100644
--- a/railties/test/application/initializer_test.rb
+++ b/railties/test/application/initializer_test.rb
@@ -132,7 +132,7 @@ module ApplicationTests
       require "#{app_path}/config/environment"
 
       assert_equal [
-        "my/other/locale.yml", "#{app_path}/config/locales/en.yml"
+        "#{app_path}/config/locales/en.yml", "my/other/locale.yml"
       ], Rails.application.config.i18n.load_path
     end
 
diff --git a/railties/test/initializer/initialize_i18n_test.rb b/railties/test/initializer/initialize_i18n_test.rb
index 904d2a6566..64396bddb4 100644
--- a/railties/test/initializer/initialize_i18n_test.rb
+++ b/railties/test/initializer/initialize_i18n_test.rb
@@ -24,8 +24,8 @@ module InitializerTests
         #{RAILS_FRAMEWORK_ROOT}/activemodel/lib/active_model/locale/en.yml
         #{RAILS_FRAMEWORK_ROOT}/activerecord/lib/active_record/locale/en.yml
         #{RAILS_FRAMEWORK_ROOT}/actionpack/lib/action_view/locale/en.yml
-        my/other/locale.yml
         #{RAILS_FRAMEWORK_ROOT}/railties/tmp/app/config/locales/en.yml
+        my/other/locale.yml
       ).map { |path| File.expand_path(path) }, I18n.load_path.map { |path| File.expand_path(path) }
     end