diff options
| author | Mike Moore <mike@blowmage.com> | 2012-09-24 14:18:58 -0600 |
|---|---|---|
| committer | Mike Moore <mike@blowmage.com> | 2012-09-24 14:21:47 -0600 |
| commit | b2e5db9c719bcbddc4777c31df6220e8d0a8c307 (patch) | |
| tree | 4be1c2d91bf333642038610d5d6c8ec306c5f64d /actionpack/lib | |
| parent | fdc11fd01a4cc4f5580bf9e5a782f2a97c8442f7 (diff) | |
| download | rails-b2e5db9c719bcbddc4777c31df6220e8d0a8c307.tar.gz rails-b2e5db9c719bcbddc4777c31df6220e8d0a8c307.tar.bz2 rails-b2e5db9c719bcbddc4777c31df6220e8d0a8c307.zip | |
Allow strings in the controller test describe blocks
Allow controller tests using the spec DSL to match strings.
Add test coverage for the register_spec_type calls.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index b9d8d39c9c..a28033fb32 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -351,6 +351,7 @@ module ActionController register_spec_type(self) do |desc| Class === desc && desc < ActionController::Metal end + register_spec_type(/Controller( ?Test)?\z/i, self) module Behavior extend ActiveSupport::Concern |