diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-09-14 20:07:29 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-09-14 20:07:29 +0200 |
| commit | dd6efe98b62946ae4d4df0672292449226b8d6fc (patch) | |
| tree | 8854f46462eacc6355ca6f8da3d7111a57e036ea /railties | |
| parent | 9362ef6e21e44341a5ef9d85ece468f407357ceb (diff) | |
| parent | b59a8d42c300651ad3384d4dab326454c088cbcc (diff) | |
| download | rails-dd6efe98b62946ae4d4df0672292449226b8d6fc.tar.gz rails-dd6efe98b62946ae4d4df0672292449226b8d6fc.tar.bz2 rails-dd6efe98b62946ae4d4df0672292449226b8d6fc.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'railties')
4 files changed, 6 insertions, 7 deletions
diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile index 6686dc3290..2355d2a31a 100644 --- a/railties/guides/source/testing.textile +++ b/railties/guides/source/testing.textile @@ -241,8 +241,7 @@ h4. Running Tests Running a test is as simple as invoking the file containing the test cases through Ruby: <shell> -$ cd test -$ ruby unit/post_test.rb +$ ruby -Itest test/unit/post_test.rb Loaded suite unit/post_test Started @@ -252,12 +251,12 @@ Finished in 0.023513 seconds. 1 tests, 1 assertions, 0 failures, 0 errors </shell> -This will run all the test methods from the test case. +This will run all the test methods from the test case. Note that +test_helper.rb+ is in the +test+ directory, hence this directory needs to be added to the load path using the +-I+ switch. You can also run a particular test method from the test case by using the +-n+ switch with the +test method name+. <shell> -$ ruby unit/post_test.rb -n test_truth +$ ruby -Itest test/unit/post_test.rb -n test_truth Loaded suite unit/post_test Started diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt index 7616614aff..91d3133ea4 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt @@ -1,5 +1,5 @@ <%= app_const %>.configure do - # Settings specified here will take precedence over those in config/environment.rb + # Settings specified here will take precedence over those in config/application.rb # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 500fc4d860..89bb891ddd 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -1,5 +1,5 @@ <%= app_const %>.configure do - # Settings specified here will take precedence over those in config/environment.rb + # Settings specified here will take precedence over those in config/application.rb # The production environment is meant for finished, "live" apps. # Code is not reloaded between requests diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt index 26cdef071a..d8d1e55157 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt @@ -1,5 +1,5 @@ <%= app_const %>.configure do - # Settings specified here will take precedence over those in config/environment.rb + # Settings specified here will take precedence over those in config/application.rb # The test environment is used exclusively to run your application's # test suite. You never need to work with it otherwise. Remember that |