aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-30 05:26:51 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-30 05:26:51 -0300
commit6c3fcc58ffe1789dd7b3e1eab751520752f488fc (patch)
tree7bb18723906e1fe319ea0184df6ca1249ce0192a /guides/source
parent1a433020bbdf365623172f1d88fc0ec6d251c5fc (diff)
parentbe0b218c421e590f178b6d489e80dca1df24e2c5 (diff)
downloadrails-6c3fcc58ffe1789dd7b3e1eab751520752f488fc.tar.gz
rails-6c3fcc58ffe1789dd7b3e1eab751520752f488fc.tar.bz2
rails-6c3fcc58ffe1789dd7b3e1eab751520752f488fc.zip
Merge pull request #20741 from radar/integration_tool_doc
Improve integration_tool documentation
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/configuring.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index bb6c395c96..79a80de3cc 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -181,7 +181,7 @@ The full set of methods that can be used in this block are as follows:
* `assets` allows to create assets on generating a scaffold. Defaults to `true`.
* `force_plural` allows pluralized model names. Defaults to `false`.
* `helper` defines whether or not to generate helpers. Defaults to `true`.
-* `integration_tool` defines which integration tool to use. Defaults to `nil`.
+* `integration_tool` defines which integration tool to use to generate integration tests. Defaults to `:test_unit`.
* `javascripts` turns on the hook for JavaScript files in generators. Used in Rails for when the `scaffold` generator is run. Defaults to `true`.
* `javascript_engine` configures the engine to be used (for eg. coffee) when generating assets. Defaults to `:js`.
* `orm` defines which orm to use. Defaults to `false` and will use Active Record by default.