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

mysociety · Feb 24, 2015 · 67a9b39 · 67a9b39
2 parents f7974a3 + 3fec0fe
commit 67a9b39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -187,11 +187,9 @@ def user_json_for_api
 
     @@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