diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-29 10:56:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-29 10:56:33 -0700 |
| commit | 295e91221123b912f2545cdc2e5623aeb53b220f (patch) | |
| tree | a41a2591753ceb1c3bb2c242a3461d7fc9a5c75a /actionview | |
| parent | 8ed1a562c6293c81c894f3fe55fe88610c4f6caa (diff) | |
| parent | 4584be9b8bd15277cc05e8729830247df45d46dc (diff) | |
| download | rails-295e91221123b912f2545cdc2e5623aeb53b220f.tar.gz rails-295e91221123b912f2545cdc2e5623aeb53b220f.tar.bz2 rails-295e91221123b912f2545cdc2e5623aeb53b220f.zip | |
Merge branch 'master' into mapper
* master:
Update url to rake docs [ci skip]
Name#model_name doesn't return a String object
Result sets never override a model's column type
[ci skip] Make last note show up in postgresql guide.
Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581.
Add @senny's changed from #14741, including code font for `resources` options, and wrapped to 80 chars. [ci skip]
Use github url for homepage of log4r [ci skip]
Remove TODO.
Ensure we always use instances of the adapter specific column class
Fix indentation from 1b4b26f [ci skip]
[ci skip] Improve form_helpers.md guide.
Clear inflections after test.
Remove unnecessary include for integration tests.
Added documentation for the :param option for resourceful routing
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/RUNNING_UNIT_TESTS.rdoc | 2 | ||||
| -rw-r--r-- | actionview/test/abstract_unit.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionview/RUNNING_UNIT_TESTS.rdoc b/actionview/RUNNING_UNIT_TESTS.rdoc index 104b3e288d..c408882827 100644 --- a/actionview/RUNNING_UNIT_TESTS.rdoc +++ b/actionview/RUNNING_UNIT_TESTS.rdoc @@ -4,7 +4,7 @@ The easiest way to run the unit tests is through Rake. The default task runs the entire test suite for all classes. For more information, checkout the full array of rake tasks with "rake -T" -Rake can be found at http://rake.rubyforge.org +Rake can be found at http://docs.seattlerb.org/rake/. == Running by hand diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index 9eae3a4fbd..7c71fdabd1 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -274,7 +274,6 @@ ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor) module ActionController class Base - include ActionController::Testing # This stub emulates the Railtie including the URL helpers from a Rails application include SharedTestRoutes.url_helpers include SharedTestRoutes.mounted_helpers |