diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-02-24 15:12:48 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-02-24 15:12:48 +0000 |
| commit | 67a9b39bd672cdecee6af11cf021f8c05f957c85 (patch) | |
| tree | 832b564aa231e7caba83dfa05f0bd74015b02983 /app/controllers | |
| parent | f7974a3c5243279f9a739a7d84174af953b38434 (diff) | |
| parent | 3fec0fe90c8f208a8ce997c09282b34af4b3621f (diff) | |
Merge branch 'allow-custom-state-testing' into rails-3-develop
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/request_controller.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 081c14d7f..e847cae1e 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -16,11 +16,9 @@ class RequestController < ApplicationController @@custom_states_loaded = false begin - if !Rails.env.test? - require 'customstates' - include RequestControllerCustomStates - @@custom_states_loaded = true - end + require 'customstates' + include RequestControllerCustomStates + @@custom_states_loaded = true rescue MissingSourceFile, NameError end |