Remove old asset_path from rails config

3 files changed, 1 insertions, 26 deletions

diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index abf6ad80cf..59dc26841f 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -22,7 +22,6 @@ module ActionMailer
       options.queue ||= app.queue
 
       # make sure readers methods get compiled
-      options.asset_path          ||= app.config.asset_path
       options.asset_host          ||= app.config.asset_host
       options.relative_url_root   ||= app.config.relative_url_root
 
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index a7a35c2685..6b9cbd8cd1 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -6,7 +6,7 @@ require 'rails/engine/configuration'
 module Rails
   class Application
     class Configuration < ::Rails::Engine::Configuration
-      attr_accessor :asset_host, :asset_path, :assets, :autoflush_log,
+      attr_accessor :asset_host, :assets, :autoflush_log,
                     :cache_classes, :cache_store, :consider_all_requests_local, :console,
                     :eager_load, :exceptions_app, :file_watcher, :filter_parameters,
                     :force_ssl, :helpers_paths, :logger, :log_formatter, :log_tags,
@@ -64,10 +64,6 @@ module Rails
         @assets.logger                   = nil
       end
 
-      def compiled_asset_path
-        "/"
-      end
-
       def encoding=(value)
         @encoding = value
         silence_warnings do
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 07d47dc67b..3ca0889cf5 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -162,11 +162,6 @@ module ApplicationTests
       assert AppTemplate::Application, AppTemplate::Application.config.eager_load_namespaces
     end
 
-    test "asset_path defaults to nil for application" do
-      require "#{app_path}/config/environment"
-      assert_equal nil, AppTemplate::Application.config.asset_path
-    end
-
     test "the application can be eager loaded even when there are no frameworks" do
       FileUtils.rm_rf("#{app_path}/config/environments")
       add_to_config <<-RUBY
@@ -441,21 +436,6 @@ module ApplicationTests
       end
     end
 
-    test "config.asset_path is not passed through env" do
-      make_basic_app do |app|
-        app.config.asset_path = "/omg%s"
-      end
-
-      class ::OmgController < ActionController::Base
-        def index
-          render :inline => "<%= image_path('foo.jpg') %>"
-        end
-      end
-
-      get "/"
-      assert_equal "/omg/images/foo.jpg", last_response.body
-    end
-
     test "config.action_view.cache_template_loading with cache_classes default" do
       add_to_config "config.cache_classes = true"
       require "#{app_path}/config/environment"