diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-11 12:56:03 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-11 12:56:03 -0300 |
commit | f166f1da4631966181020118cd950f3111f83d61 (patch) | |
tree | f60124664b677f99ed8c32435799907689e70e14 /railties/test | |
parent | f1a4f0a494ce09dfea3a80854bbc6363e62d04a6 (diff) | |
parent | f612c2b0526e326eb6c25a7bbf375ac3ac793a3c (diff) | |
download | rails-f166f1da4631966181020118cd950f3111f83d61.tar.gz rails-f166f1da4631966181020118cd950f3111f83d61.tar.bz2 rails-f166f1da4631966181020118cd950f3111f83d61.zip |
Merge pull request #14689 from matthewd/asset_initializer
Move assets precompile (and version) to an initializer
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 8e1aeddb2b..b7bc721247 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -237,6 +237,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_generator_if_skip_sprockets_is_given run_generator [destination_root, "--skip-sprockets"] + assert_no_file "config/initializers/assets.rb" assert_file "config/application.rb" do |content| assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content) end @@ -252,7 +253,6 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_no_match(/config\.assets\.digest = true/, content) assert_no_match(/config\.assets\.js_compressor = :uglifier/, content) assert_no_match(/config\.assets\.css_compressor = :sass/, content) - assert_no_match(/config\.assets\.version = '1\.0'/, content) end end |