diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-11-09 21:37:37 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-11-09 21:38:01 -0600 |
commit | 1004fcb76761aa42ff18d8aa373614a41a259d3c (patch) | |
tree | 751ca5c3caf8d1338811fdcd64da157b4cd7bf43 /actionpack/lib/action_dispatch/testing/assertions.rb | |
parent | 08f7c4dd8951053c443371f786be59d04448c225 (diff) | |
download | rails-1004fcb76761aa42ff18d8aa373614a41a259d3c.tar.gz rails-1004fcb76761aa42ff18d8aa373614a41a259d3c.tar.bz2 rails-1004fcb76761aa42ff18d8aa373614a41a259d3c.zip |
Fixed AD assertion autoloads [#3470 state:resolved]
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions.rb | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions.rb b/actionpack/lib/action_dispatch/testing/assertions.rb index 96f08f2355..0e4a92048f 100644 --- a/actionpack/lib/action_dispatch/testing/assertions.rb +++ b/actionpack/lib/action_dispatch/testing/assertions.rb @@ -1,8 +1,21 @@ module ActionDispatch module Assertions - %w(response selector tag dom routing model).each do |kind| - require "action_dispatch/testing/assertions/#{kind}" - include const_get("#{kind.camelize}Assertions") + autoload :DomAssertions, 'action_dispatch/testing/assertions/dom' + autoload :ModelAssertions, 'action_dispatch/testing/assertions/model' + autoload :ResponseAssertions, 'action_dispatch/testing/assertions/response' + autoload :RoutingAssertions, 'action_dispatch/testing/assertions/routing' + autoload :SelectorAssertions, 'action_dispatch/testing/assertions/selector' + autoload :TagAssertions, 'action_dispatch/testing/assertions/tag' + + extend ActiveSupport::Concern + + included do + include DomAssertions + include ModelAssertions + include ResponseAssertions + include RoutingAssertions + include SelectorAssertions + include TagAssertions end end end |