aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2012-10-15 09:51:20 -0500
committerJoshua Peek <josh@joshpeek.com>2012-10-15 09:51:20 -0500
commit7dba1599d9092a8362956a3fab23b2c60eedea63 (patch)
tree23b974b33fcaed7a3288dda349eaf553e0354ff8 /railties
parent3db69909b9d4549128984c4c76f8a51eca3d79e6 (diff)
downloadrails-7dba1599d9092a8362956a3fab23b2c60eedea63.tar.gz
rails-7dba1599d9092a8362956a3fab23b2c60eedea63.tar.bz2
rails-7dba1599d9092a8362956a3fab23b2c60eedea63.zip
Remove old asset_path from rails config
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/application/configuration.rb6
-rw-r--r--railties/test/application/configuration_test.rb20
2 files changed, 1 insertions, 25 deletions
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"