diff options
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/assertions.rb | 12 | ||||
-rw-r--r-- | actionpack/lib/action_controller/assertions/dom_assertions.rb (renamed from actionpack/lib/action_controller/assertions/assert_dom.rb) | 0 | ||||
-rw-r--r-- | actionpack/lib/action_controller/assertions/model_assertions.rb (renamed from actionpack/lib/action_controller/assertions/assert_valid.rb) | 0 | ||||
-rw-r--r-- | actionpack/lib/action_controller/assertions/response_assertions.rb (renamed from actionpack/lib/action_controller/assertions/assert_response.rb) | 0 | ||||
-rw-r--r-- | actionpack/lib/action_controller/assertions/routing_assertions.rb (renamed from actionpack/lib/action_controller/assertions/assert_routing.rb) | 0 | ||||
-rw-r--r-- | actionpack/lib/action_controller/assertions/selector_assertions.rb (renamed from actionpack/lib/action_controller/assertions/assert_select.rb) | 0 | ||||
-rw-r--r-- | actionpack/lib/action_controller/assertions/tag_assertions.rb (renamed from actionpack/lib/action_controller/assertions/assert_tag.rb) | 0 |
7 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb index c11cc004db..b0297b6c01 100644 --- a/actionpack/lib/action_controller/assertions.rb +++ b/actionpack/lib/action_controller/assertions.rb @@ -47,12 +47,12 @@ module ActionController #:nodoc: end end -require File.dirname(__FILE__) + '/assertions/assert_response' -require File.dirname(__FILE__) + '/assertions/assert_select' -require File.dirname(__FILE__) + '/assertions/assert_tag' -require File.dirname(__FILE__) + '/assertions/assert_dom' -require File.dirname(__FILE__) + '/assertions/assert_routing' -require File.dirname(__FILE__) + '/assertions/assert_valid' +require File.dirname(__FILE__) + '/assertions/response_assertions' +require File.dirname(__FILE__) + '/assertions/selector_assertions' +require File.dirname(__FILE__) + '/assertions/tag_assertions' +require File.dirname(__FILE__) + '/assertions/dom_assertions' +require File.dirname(__FILE__) + '/assertions/routing_assertions' +require File.dirname(__FILE__) + '/assertions/model_assertions' module Test #:nodoc: module Unit #:nodoc: diff --git a/actionpack/lib/action_controller/assertions/assert_dom.rb b/actionpack/lib/action_controller/assertions/dom_assertions.rb index a765dff2cc..a765dff2cc 100644 --- a/actionpack/lib/action_controller/assertions/assert_dom.rb +++ b/actionpack/lib/action_controller/assertions/dom_assertions.rb diff --git a/actionpack/lib/action_controller/assertions/assert_valid.rb b/actionpack/lib/action_controller/assertions/model_assertions.rb index b807a8902f..b807a8902f 100644 --- a/actionpack/lib/action_controller/assertions/assert_valid.rb +++ b/actionpack/lib/action_controller/assertions/model_assertions.rb diff --git a/actionpack/lib/action_controller/assertions/assert_response.rb b/actionpack/lib/action_controller/assertions/response_assertions.rb index 5d5effc493..5d5effc493 100644 --- a/actionpack/lib/action_controller/assertions/assert_response.rb +++ b/actionpack/lib/action_controller/assertions/response_assertions.rb diff --git a/actionpack/lib/action_controller/assertions/assert_routing.rb b/actionpack/lib/action_controller/assertions/routing_assertions.rb index a94bb719f2..a94bb719f2 100644 --- a/actionpack/lib/action_controller/assertions/assert_routing.rb +++ b/actionpack/lib/action_controller/assertions/routing_assertions.rb diff --git a/actionpack/lib/action_controller/assertions/assert_select.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb index 7e22d6b655..7e22d6b655 100644 --- a/actionpack/lib/action_controller/assertions/assert_select.rb +++ b/actionpack/lib/action_controller/assertions/selector_assertions.rb diff --git a/actionpack/lib/action_controller/assertions/assert_tag.rb b/actionpack/lib/action_controller/assertions/tag_assertions.rb index dc80b442b7..dc80b442b7 100644 --- a/actionpack/lib/action_controller/assertions/assert_tag.rb +++ b/actionpack/lib/action_controller/assertions/tag_assertions.rb |