Merge branch 'allow-custom-state-testing' into rails-3-develop

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