aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2007-10-26 01:07:41 +0000
committerMarcel Molina <marcel@vernix.org>2007-10-26 01:07:41 +0000
commit423788371a78da977eca78eb21e64adaaf517fc7 (patch)
treead74183b8fdba9792e78f14b0cdcd2ddb5999b87 /railties
parent65e18af03a416c20e13fce5677ebe8de82aa0f7c (diff)
downloadrails-423788371a78da977eca78eb21e64adaaf517fc7.tar.gz
rails-423788371a78da977eca78eb21e64adaaf517fc7.tar.bz2
rails-423788371a78da977eca78eb21e64adaaf517fc7.zip
Fix typo in test_helper. Closes #9925 [viktor tron]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8020 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/helpers/test_helper.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 99dc2c54d6..26b16de209 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix typo in test_helper. Closes #9925 [viktor tron]
+
* Request profiler. [Jeremy Kemper]
* config/boot.rb correctly detects RAILS_GEM_VERSION. #9834 [alexch, thewoolleyman]
diff --git a/railties/helpers/test_helper.rb b/railties/helpers/test_helper.rb
index 6970dbac37..11ee5d62d2 100644
--- a/railties/helpers/test_helper.rb
+++ b/railties/helpers/test_helper.rb
@@ -29,8 +29,8 @@ class Test::Unit::TestCase
# need to change this line to explicitly name the order you desire.
#
# Note: You'll currently still have to declare fixtures explicitly in integration tests
- # -- they do not yet inherent this setting
+ # -- they do not yet inherit this setting
fixtures :all
# Add more helper methods to be used by all tests here...
-end \ No newline at end of file
+end