aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-04 21:58:03 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-04 21:58:03 -0700
commit9f57ee595a318033485788e9dc59e8cf08b34083 (patch)
tree610dc32b88ea63323c507a5d9662b0529d1cf457
parent6f74d36c4263a6cbbc6dc32a03edeed04faefbd9 (diff)
parent5be3d89f4e2ecd78d631a33f2ebbf4a8cd017096 (diff)
downloadrails-9f57ee595a318033485788e9dc59e8cf08b34083.tar.gz
rails-9f57ee595a318033485788e9dc59e8cf08b34083.tar.bz2
rails-9f57ee595a318033485788e9dc59e8cf08b34083.zip
Merge pull request #6968 from guilleiguaran/update-test-helper
CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that
-rw-r--r--railties/lib/rails/generators/rails/app/templates/test/test_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
index 0090293200..9afda2d0df 100644
--- a/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
@@ -6,7 +6,7 @@ class ActiveSupport::TestCase
<% unless options[:skip_active_record] -%>
ActiveRecord::Migration.check_pending!
- # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+ # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
#
# Note: You'll currently still have to declare fixtures explicitly in integration tests
# -- they do not yet inherit this setting