diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-18 18:47:22 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-18 18:47:22 -0200 |
| commit | 1b9e85dbbd7d974143e67affb3166d7244cc99db (patch) | |
| tree | 66e446c1a6bf17c1873f34a97b404e92a232c67d /actionpack/lib/action_controller | |
| parent | edc39ff756d09b746bdc1acb8d814c3148289846 (diff) | |
| download | rails-1b9e85dbbd7d974143e67affb3166d7244cc99db.tar.gz rails-1b9e85dbbd7d974143e67affb3166d7244cc99db.tar.bz2 rails-1b9e85dbbd7d974143e67affb3166d7244cc99db.zip | |
Make sure assert_select can assert body tag
This reverts commit f93df52845766216f0fe36a4586f8abad505cac4, reversing
changes made to a455e3f4e9dbfb9630d47878e1239bc424fb7d13.
Conflicts:
actionpack/lib/action_controller/test_case.rb
actionview/lib/action_view/test_case.rb
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 097019144c..30eae41f60 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -679,10 +679,6 @@ module ActionController klass.new end - def document_root_element - html_document - end - included do include ActionController::TemplateAssertions include ActionDispatch::Assertions @@ -692,6 +688,10 @@ module ActionController private + def document_root_element + html_document.root + end + def check_required_ivars # Sanity check for required instance variables so we can give an # understandable error message. |