aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2015-05-17 10:12:24 +0100
committerAbdelkader Boudih <terminale@gmail.com>2015-05-17 10:12:24 +0100
commitbdc1e9c28cfdefba9aee62eb240c221f622b720d (patch)
tree44910fa60f73faabae0c72c22abde3b1ce13f85c
parent50999974e80ee9ddf3d81c3b9733f84f5646705c (diff)
parentbea8f7c057747cdc68fdc4204998f2f12c938633 (diff)
downloadrails-bdc1e9c28cfdefba9aee62eb240c221f622b720d.tar.gz
rails-bdc1e9c28cfdefba9aee62eb240c221f622b720d.tar.bz2
rails-bdc1e9c28cfdefba9aee62eb240c221f622b720d.zip
Merge pull request #20176 from repinel/remove_test_unit_from_docs
[ci skip] remove unnecessary mention to Test::Unit from docs
-rw-r--r--activesupport/lib/active_support/inflector/methods.rb8
-rw-r--r--guides/source/configuring.md2
2 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index a08c655d69..bde70d772d 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -231,8 +231,8 @@ module ActiveSupport
# Tries to find a constant with the name specified in the argument string.
#
- # 'Module'.constantize # => Module
- # 'Test::Unit'.constantize # => Test::Unit
+ # 'Module'.constantize # => Module
+ # 'Foo::Bar'.constantize # => Foo::Bar
#
# The name is assumed to be the one of a top-level constant, no matter
# whether it starts with "::" or not. No lexical context is taken into
@@ -280,8 +280,8 @@ module ActiveSupport
# Tries to find a constant with the name specified in the argument string.
#
- # safe_constantize('Module') # => Module
- # safe_constantize('Test::Unit') # => Test::Unit
+ # safe_constantize('Module') # => Module
+ # safe_constantize('Foo::Bar') # => Foo::Bar
#
# The name is assumed to be the one of a top-level constant, no matter
# whether it starts with "::" or not. No lexical context is taken into
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 342d39a528..e26cd0eea8 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -193,7 +193,7 @@ The full set of methods that can be used in this block are as follows:
* `scaffold_controller` different from `resource_controller`, defines which generator to use for generating a _scaffolded_ controller when using `rails generate scaffold`. Defaults to `:scaffold_controller`.
* `stylesheets` turns on the hook for stylesheets in generators. Used in Rails for when the `scaffold` generator is run, but this hook can be used in other generates as well. Defaults to `true`.
* `stylesheet_engine` configures the stylesheet engine (for eg. sass) to be used when generating assets. Defaults to `:css`.
-* `test_framework` defines which test framework to use. Defaults to `false` and will use Test::Unit by default.
+* `test_framework` defines which test framework to use. Defaults to `false` and will use Minitest by default.
* `template_engine` defines which template engine to use, such as ERB or Haml. Defaults to `:erb`.
### Configuring Middleware