diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:51:13 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:51:13 -0300 |
| commit | cdc00aba62ffb0f0af452f5152aafeb5e490962e (patch) | |
| tree | 071ca4766dd07b9af34bbebf902c50a27c5c2b4d /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | cc9091c3e719facd0f73c8ab425a5bb9a7d0a65b (diff) | |
| parent | c78da4d5c472f7254ed609ef753d7b1719732802 (diff) | |
| download | rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.tar.gz rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.tar.bz2 rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.zip | |
Merge branch 'loofah'
Conflicts:
Gemfile
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 192ccdb9d5..2d1c3ac5c7 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -495,5 +495,9 @@ module ActionDispatch reset! unless integration_session integration_session.url_options end + + def document_root_element + html_document.root + end end end |