Don't raise secret token generation error during tests.

fatfreecrm · Jan 7, 2014 · 6e1624e · 6e1624e
1 parent 71a99f1
commit 6e1624e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
@@ -19,7 +19,7 @@
 #
 # We should setup a secret token if FFCRM is running in application mode but NOT in engine mode.
 # This functionality has been extracted to lib so it can be tested.
-if FatFreeCRM.application? and !Rails.env.test?
+if FatFreeCRM.application?
   require 'fat_free_crm/secret_token_generator'
   FatFreeCRM::SecretTokenGenerator.setup!
 end
diff --git a/lib/fat_free_crm/secret_token_generator.rb b/lib/fat_free_crm/secret_token_generator.rb
@@ -21,7 +21,7 @@ def setup!
           generate_and_persist_token!
         end
         FatFreeCRM::Application.config.secret_token = token
-        raise(FAIL_MESSAGE) if FatFreeCRM::Application.config.secret_token.blank?
+        raise(FAIL_MESSAGE) if FatFreeCRM::Application.config.secret_token.blank?# and !Rails.env.test?
       end
 
       private