aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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