diff options
| author | wycats <wycats@gmail.com> | 2011-05-22 23:13:44 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2011-05-22 23:13:44 -0700 |
| commit | ddc584e89eaf6845f8cd72bcafce5035c9893dbb (patch) | |
| tree | 87d323e45b2eae1575887a14ca4c15d288d1869e /actionpack/lib/action_dispatch/testing/assertions.rb | |
| parent | 0afefa95049766836e32e6a76873423d8640ebe3 (diff) | |
| download | rails-ddc584e89eaf6845f8cd72bcafce5035c9893dbb.tar.gz rails-ddc584e89eaf6845f8cd72bcafce5035c9893dbb.tar.bz2 rails-ddc584e89eaf6845f8cd72bcafce5035c9893dbb.zip | |
Restructure TemplateAssertions-related code to eliminate circular requires.
Also, no need to include dependencies in AS::Concerns inside included blocks.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions.rb b/actionpack/lib/action_dispatch/testing/assertions.rb index 822150b768..226baf9ad0 100644 --- a/actionpack/lib/action_dispatch/testing/assertions.rb +++ b/actionpack/lib/action_dispatch/testing/assertions.rb @@ -8,12 +8,11 @@ module ActionDispatch extend ActiveSupport::Concern - included do - include DomAssertions - include ResponseAssertions - include RoutingAssertions - include SelectorAssertions - include TagAssertions - end + include DomAssertions + include ResponseAssertions + include RoutingAssertions + include SelectorAssertions + include TagAssertions end end + |