diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-11 08:15:54 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-11 08:15:54 -0700 |
| commit | 90a97156e4c4618f2702c2bdc3415138e9f94add (patch) | |
| tree | 77872012443eea5988b723f3cf285e1776a48bdf /railties/lib/rails/generators | |
| parent | 8fc391572c6e8342088bc0b8ee78c1dff5abb04d (diff) | |
| parent | 3ed41e579e45464aa6e6342783b77f9ec29e339c (diff) | |
| download | rails-90a97156e4c4618f2702c2bdc3415138e9f94add.tar.gz rails-90a97156e4c4618f2702c2bdc3415138e9f94add.tar.bz2 rails-90a97156e4c4618f2702c2bdc3415138e9f94add.zip | |
Merge pull request #9080 from sikachu/master-rails-test
Add `rails test` command to run the test suite
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/test_helper.rb | 7 |
1 files changed, 4 insertions, 3 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 9afda2d0df..ca40914d3b 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 @@ -1,4 +1,4 @@ -ENV["RAILS_ENV"] = "test" +ENV["RAILS_ENV"] ||= "test" require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' @@ -6,11 +6,12 @@ class ActiveSupport::TestCase <% unless options[:skip_active_record] -%> ActiveRecord::Migration.check_pending! - # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + # Uncomment the `fixtures :all` line below to 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 - fixtures :all + # fixtures :all <% end -%> # Add more helper methods to be used by all tests here... |