aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorGabe Kopley <gabe@coshx.com>2013-03-24 22:31:48 -0700
committerGabe Kopley <gabe@coshx.com>2013-03-24 22:31:48 -0700
commit940da7d9cbb39bc9589031df62e26edfc0c1f8bc (patch)
tree115783cb882b76bae9d8f5909cf545fb207b0074 /railties/test
parent592b4b40c285419e3074da99f82e0da40f29e6d0 (diff)
downloadrails-940da7d9cbb39bc9589031df62e26edfc0c1f8bc.tar.gz
rails-940da7d9cbb39bc9589031df62e26edfc0c1f8bc.tar.bz2
rails-940da7d9cbb39bc9589031df62e26edfc0c1f8bc.zip
Put coffee-rails in top-level of generated Gemfile
v3 of pull request based on additional feedback from @jeremy
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 0697035871..0daea2fd0a 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -232,8 +232,8 @@ class AppGeneratorTest < Rails::Generators::TestCase
end
assert_file "Gemfile" do |content|
assert_no_match(/sass-rails/, content)
- assert_no_match(/coffee-rails/, content)
assert_no_match(/uglifier/, content)
+ assert_match(/coffee-rails/, content)
end
assert_file "config/environments/development.rb" do |content|
assert_no_match(/config\.assets\.debug = true/, content)
@@ -293,6 +293,9 @@ class AppGeneratorTest < Rails::Generators::TestCase
assert_file "app/assets/javascripts/application.js" do |contents|
assert_no_match %r{^//=\s+require\s}, contents
end
+ assert_file "Gemfile" do |content|
+ assert_match(/coffee-rails/, content)
+ end
end
def test_inclusion_of_debugger