From 408bafca09cdcef110bebebeddea2b80c969bb64 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Thu, 12 Jan 2012 15:04:14 -0800
Subject: [PATCH] add/refactor normalize_pod_services so configured services is
 always defined regardless if SERVICES are set up

---
 app/models/app_config.rb       |  5 ++---
 spec/models/app_config_spec.rb | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/models/app_config.rb b/app/models/app_config.rb
index 77b36a5e8..88857781e 100644
--- a/app/models/app_config.rb
+++ b/app/models/app_config.rb
@@ -107,14 +107,13 @@ HELP
   end
 
   def self.normalize_pod_services
+    self['configured_services'] = []
     if defined?(SERVICES)
-      configured_services = []
       SERVICES.keys.each do |service|
         unless SERVICES[service].keys.any?{|service_key| SERVICES[service][service_key].blank?}
-          configured_services << service
+          self['configured_services'] << service
         end
       end
-      self['configured_services'] = configured_services
     end
   end
 
diff --git a/spec/models/app_config_spec.rb b/spec/models/app_config_spec.rb
index a00c74090..31961abe2 100644
--- a/spec/models/app_config_spec.rb
+++ b/spec/models/app_config_spec.rb
@@ -175,6 +175,22 @@ describe AppConfig do
     end
   end
 
+  describe '.normalize_services' do
+    before do
+      @services = SERVICES
+      Object.send(:remove_const, :SERVICES)
+    end
+
+    after do
+      SERVICES = @services
+    end
+
+    it 'sets configured_services to an empty array if SERVICES is not defined' do
+      AppConfig.normalize_pod_services
+      AppConfig.configured_services.should == []
+    end
+  end
+
   describe ".[]=" do
     describe "when setting pod_url" do
       context "with a symbol" do