Get the railties tests to pass again.

actionmailer/lib/action_mailer/railtie.rb

@@ -16,11 +16,6 @@ class Railtie < Rails::Railtie
       ActionMailer::Base.logger ||= Rails.logger
     end
 
-    initializer "action_mailer.add_view_paths" do |app|
-      views = app.config.paths.app.views.to_a
-      ActionMailer::Base.prepend_view_path(views)
-    end
-
     initializer "action_mailer.set_configs" do |app|
       app.config.action_mailer.each do |k,v|
         ActionMailer::Base.send "#{k}=", v

actionpack/lib/action_controller/railtie.rb

@@ -27,11 +27,6 @@ class Railtie < Rails::Railtie
       ActionController::Base.cache_store ||= RAILS_CACHE
     end
 
-    initializer "action_controller.add_view_paths" do |app|
-      views = app.config.paths.app.views.to_a
-      ActionController::Base.prepend_view_path(views)
-    end
-
     initializer "action_controller.set_helpers_path" do |app|
       ActionController::Base.helpers_path = app.config.paths.app.helpers.to_a
     end

railties/lib/rails/engine.rb

@@ -97,8 +97,8 @@ def load_tasks
 
     initializer :add_view_paths do
       views = paths.app.views.to_a
-      ActionController::Base.prepend_view_path(views) if defined?(ActionController)
-      ActionMailer::Base.prepend_view_path(views) if defined?(ActionMailer)
+      ActionController::Base.prepend_view_path(views) if defined?(ActionController::Base)
+      ActionMailer::Base.prepend_view_path(views) if defined?(ActionMailer::Base)
     end
 
     initializer :add_metals do |app|

railties/test/railties/railtie_test.rb

@@ -54,7 +54,7 @@ class Bar < Rails::Railtie
     test "railtie can add log subscribers" do
       begin
         class Foo < Rails::Railtie ; log_subscriber(Rails::LogSubscriber.new) ; end
-        assert_kind_of Rails::LogSubscriber, Rails::LogSubscriber.log_subscribers[:foo]
+        assert_kind_of Rails::LogSubscriber, Rails::LogSubscriber.log_subscribers[0]
       ensure
         Rails::LogSubscriber.log_subscribers.clear
       end