diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index f77a489309..5c312317d6 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Documentation fix: integration test scripts don't require integration_test. Closes #4914. [Frederick Ros <sl33p3r@free.fr>] + * ActionController::Base Summary documentation rewrite. Closes #4900. [kevin.clark@gmail.com] * Fix text_helper.rb documentation rendering. Closes #4725. [Frederick Ros] diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index c96dd9c513..74817c4b4c 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -347,7 +347,6 @@ module ActionController # using the get/post methods: # # require "#{File.dirname(__FILE__)}/test_helper" - # require "integration_test" # # class ExampleTest < ActionController::IntegrationTest # fixtures :people @@ -372,7 +371,6 @@ module ActionController # reference any named routes you happen to have defined! # # require "#{File.dirname(__FILE__)}/test_helper" - # require "integration_test" # # class AdvancedTest < ActionController::IntegrationTest # fixtures :people, :rooms |