From 3fec0fe90c8f208a8ce997c09282b34af4b3621f Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 9 Feb 2015 17:11:57 +0000 Subject: 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 --- app/controllers/request_controller.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'app/controllers/request_controller.rb') 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 -- cgit v1.2.3