diff options
| author | Richard Schneeman <richard.schneeman@gmail.com> | 2015-07-29 20:39:03 -0500 |
|---|---|---|
| committer | Richard Schneeman <richard.schneeman@gmail.com> | 2015-07-29 20:39:03 -0500 |
| commit | 10e994cc07dbd4ff87db225f15850197a9c6bb18 (patch) | |
| tree | cab2db25385e59797796500051b64bf339f92bd3 | |
| parent | ff47e45d14737ac20a69089a3c7f54cb7e8dc47a (diff) | |
| parent | 9b18ba75b1e6910c2737d82fca5af856192c6498 (diff) | |
| download | rails-10e994cc07dbd4ff87db225f15850197a9c6bb18.tar.gz rails-10e994cc07dbd4ff87db225f15850197a9c6bb18.tar.bz2 rails-10e994cc07dbd4ff87db225f15850197a9c6bb18.zip | |
Merge pull request #21065 from rails/schneems/fix-assets_test
Fix tests on master
| -rw-r--r-- | railties/test/application/assets_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/application/rake/notes_test.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index 6952472ff5..ba2c27d8e8 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -60,6 +60,7 @@ module ApplicationTests test "assets do not require compressors until it is used" do app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();" add_to_env_config "production", "config.assets.compile = true" + add_to_env_config "production", "config.assets.precompile = []" ENV["RAILS_ENV"] = "production" require "#{app_path}/config/environment" diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb index d6f5fee5c3..c87515f00f 100644 --- a/railties/test/application/rake/notes_test.rb +++ b/railties/test/application/rake/notes_test.rb @@ -114,6 +114,7 @@ module ApplicationTests end test 'register a new extension' do + add_to_config "config.assets.precompile = []" add_to_config %q{ config.annotations.register_extensions("scss", "sass") { |annotation| /\/\/\s*(#{annotation}):?\s*(.*)$/ } } app_file "app/assets/stylesheets/application.css.scss", "// TODO: note in scss" app_file "app/assets/stylesheets/application.css.sass", "// TODO: note in sass" |