diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-02-09 17:11:57 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-02-09 17:11:57 +0000 |
| commit | 3fec0fe90c8f208a8ce997c09282b34af4b3621f (patch) | |
| tree | 6be19e4cd9449f82ecf7cdf4a50634c385044238 | |
| parent | 1de7224adefb9ad0c976956144fc0f9907a85d2d (diff) | |
Allow custom states to be tested.
Since https://github.com/mysociety/alaveteli/commit/80ad2d4c31075ffc994e8c48ea25e6e3c486c364
no themes have been loaded by tests unless explicitly specified, so I think it's safe to
remove the code added in https://github.com/mysociety/alaveteli/commit/3dfc53f6b82b3c5da79a4c710d45b859f61f4f5f
| -rw-r--r-- | app/controllers/request_controller.rb | 8 | ||||
| -rw-r--r-- | app/models/info_request.rb | 8 |
2 files changed, 6 insertions, 10 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 diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 814057ef4..fd42ccd9c 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -187,11 +187,9 @@ class InfoRequest < ActiveRecord::Base @@custom_states_loaded = false begin - if !Rails.env.test? - require 'customstates' - include InfoRequestCustomStates - @@custom_states_loaded = true - end + require 'customstates' + include InfoRequestCustomStates + @@custom_states_loaded = true rescue MissingSourceFile, NameError end |