aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-05 14:00:43 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-05 14:00:43 -0300
commit4017f6c7e6990e04d81fef943fd6bd6691e11f8f (patch)
treea0af66b1e76523f63932e862e1bc21120529b129 /railties/test
parent201f8d7753b594229a517e10a7181b15f3a33ffd (diff)
downloadrails-4017f6c7e6990e04d81fef943fd6bd6691e11f8f.tar.gz
rails-4017f6c7e6990e04d81fef943fd6bd6691e11f8f.tar.bz2
rails-4017f6c7e6990e04d81fef943fd6bd6691e11f8f.zip
Make sure assets is disable when --skip-sprockets is used
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 331056f27d..945cb61bc1 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -224,7 +224,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
run_generator [destination_root, "--skip-sprockets"]
assert_file "config/application.rb" do |content|
assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content)
- assert_no_match(/config\.assets\.enabled = true/, content)
+ assert_match(/config\.assets\.enabled = false/, content)
end
assert_file "Gemfile" do |content|
assert_no_match(/sass-rails/, content)
@@ -238,6 +238,7 @@ 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
assert_file "test/performance/browsing_test.rb"
end