From da5446a4387299db8ab1cc499473a970aa76f0f4 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 9 Mar 2015 12:21:41 +1100
Subject: [PATCH] FIX: Don't use discourse.conf in test

---
 app/models/global_setting.rb | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 08bd5cafc83..e3cb2532a12 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -102,15 +102,29 @@ class GlobalSetting
     end
   end
 
+  class BlankProvider < BaseProvider
+    def lookup(key, default)
+      default
+    end
+
+    def keys
+      []
+    end
+  end
+
 
   class << self
     attr_accessor :provider
   end
 
 
-  @provider =
-    FileProvider.from(File.expand_path('../../../config/discourse.conf', __FILE__)) ||
-    EnvProvider.new
+  if Rails.env == "test"
+    @provider = BlankProvider.new
+  else
+    @provider =
+      FileProvider.from(File.expand_path('../../../config/discourse.conf', __FILE__)) ||
+      EnvProvider.new
+  end
 
   load_defaults
 end