diff options
| author | José Valim <jose.valim@gmail.com> | 2011-10-03 02:10:40 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-10-03 02:10:40 -0700 |
| commit | 9c6d4801d1a2ef026feb2d122b7b10930d617476 (patch) | |
| tree | 1bf34ce9e136a3635209353f7ce43192491fe451 | |
| parent | daca35c394dd490aeeaad9074141d7d86e9efb2c (diff) | |
| parent | 0eb80fabdd46baaf06e27697cfbd2cd8900d7f67 (diff) | |
| download | rails-9c6d4801d1a2ef026feb2d122b7b10930d617476.tar.gz rails-9c6d4801d1a2ef026feb2d122b7b10930d617476.tar.bz2 rails-9c6d4801d1a2ef026feb2d122b7b10930d617476.zip | |
Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantize
use safe_constantize instead constantize in AC::TestCase
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 964ec6d5ae..6913c1ef4a 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -364,9 +364,7 @@ module ActionController end def determine_default_controller_class(name) - name.sub(/Test$/, '').constantize - rescue NameError - nil + name.sub(/Test$/, '').safe_constantize end def prepare_controller_class(new_class) |