2 files changed, 6 insertions, 22 deletions
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 8e76bf27f3..2d45c9b53f 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -35,8 +35,8 @@ module ApplicationTests
       require "#{app_path}/config/environment"
 
       expanded_path = File.expand_path("app/views", app_path)
-      assert_equal ActionController::Base.view_paths[0].to_s, expanded_path
-      assert_equal ActionMailer::Base.view_paths[0].to_s, expanded_path
+      assert_equal expanded_path, ActionController::Base.view_paths[0].to_s
+      assert_equal expanded_path, ActionMailer::Base.view_paths[0].to_s
     end
 
     test "allows me to configure default url options for ActionMailer" do
@@ -50,7 +50,7 @@ module ApplicationTests
       assert_equal "test.rails", ActionMailer::Base.default_url_options[:host]
     end
 
-    test "does not include url helpers as action methods" do
+    test "includes url helpers as action methods" do
       app_file "config/routes.rb", <<-RUBY
         Rails.application.routes.draw do
           get "/foo", :to => lambda { |env| [200, {}, []] }, :as => :foo
@@ -66,8 +66,8 @@ module ApplicationTests
 
       require "#{app_path}/config/environment"
       assert Foo.method_defined?(:foo_path)
+      assert Foo.method_defined?(:foo_url)
       assert Foo.method_defined?(:main_app)
-      assert_equal Set.new(["notify"]), Foo.action_methods
     end
 
     test "allows to not load all helpers for controllers" do
diff --git a/railties/test/application/initializers/i18n_test.rb b/railties/test/application/initializers/i18n_test.rb
index bc34897cdf..9ee54796a4 100644
--- a/railties/test/application/initializers/i18n_test.rb
+++ b/railties/test/application/initializers/i18n_test.rb
@@ -184,28 +184,13 @@ en:
       assert_fallbacks ca: [:ca, :"es-ES", :es, :'en-US', :en]
     end
 
-    test "config.i18n.enforce_available_locales is set to true by default and avoids I18n warnings" do
-      add_to_config <<-RUBY
-        config.i18n.default_locale = :it
-      RUBY
-
-      output = capture(:stderr) { load_app }
-      assert_no_match %r{deprecated.*enforce_available_locales}, output
-      assert_equal true, I18n.enforce_available_locales
-
-      assert_raise I18n::InvalidLocale do
-        I18n.locale = :es
-      end
-    end
-
     test "disable config.i18n.enforce_available_locales" do
       add_to_config <<-RUBY
         config.i18n.enforce_available_locales = false
         config.i18n.default_locale = :fr
       RUBY
 
-      output = capture(:stderr) { load_app }
-      assert_no_match %r{deprecated.*enforce_available_locales}, output
+      load_app
       assert_equal false, I18n.enforce_available_locales
 
       assert_nothing_raised do
@@ -220,8 +205,7 @@ en:
         config.i18n.default_locale = :fr
       RUBY
 
-      output = capture(:stderr) { load_app }
-      assert_no_match %r{deprecated.*enforce_available_locales}, output
+      load_app
       assert_equal false, I18n.enforce_available_locales
 
       assert_nothing_raised do