diff options
author | José Valim <jose.valim@gmail.com> | 2011-06-07 23:39:49 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-06-07 23:39:49 -0700 |
commit | c6503f48bd13c696fcc81f2a4a87b8cd7c009657 (patch) | |
tree | c4c1ddcce93b19d22b5ec69d01cc5f4aa1a19ed5 /actionpack/test | |
parent | 185235333c7b345e7cbb6384446c89d8447f5d79 (diff) | |
parent | 1bbc51e5a73a5f97565abae43f13f96209441bb8 (diff) | |
download | rails-c6503f48bd13c696fcc81f2a4a87b8cd7c009657.tar.gz rails-c6503f48bd13c696fcc81f2a4a87b8cd7c009657.tar.bz2 rails-c6503f48bd13c696fcc81f2a4a87b8cd7c009657.zip |
Merge pull request #1547 from sikachu/safebuffer
Fix ActionPack tests on `master`
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/abstract_unit.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 60534a9746..24d071df39 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -151,6 +151,7 @@ class BasicController config.assets_dir = public_dir config.javascripts_dir = "#{public_dir}/javascripts" config.stylesheets_dir = "#{public_dir}/stylesheets" + config.assets = ActiveSupport::InheritableOptions.new({ :prefix => "assets" }) config end end |