aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-04-27 22:51:39 +0000
committerMarcel Molina <marcel@vernix.org>2006-04-27 22:51:39 +0000
commitf3ce39749cbd35bdeac1fdea27bd3136977a8188 (patch)
tree9c7d059fbcf6f3413b3d171d6a55ae0f49d62065 /actionpack
parentb2c0ddf033fbf143539ad8a7630747a0e866e4fc (diff)
downloadrails-f3ce39749cbd35bdeac1fdea27bd3136977a8188.tar.gz
rails-f3ce39749cbd35bdeac1fdea27bd3136977a8188.tar.bz2
rails-f3ce39749cbd35bdeac1fdea27bd3136977a8188.zip
Documentation fix: integration test scripts don't require integration_test. Closes #4914. [Frederick Ros <sl33p3r@free.fr>]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4292 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/integration.rb2
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