spec/settings_spec.rb in indico-0.9.2 vs spec/settings_spec.rb in indico-0.9.3

@@ -23,10 +23,14 @@
     end
 
     it 'should read in variables from the user\'s environment' do
         api_key = 'testapikey'
         cloud = 'cloud'
+
+        saved_api_key = ENV['INDICO_API_KEY']
+        saved_private_cloud = ENV['INDICO_CLOUD']
+
         ENV['INDICO_API_KEY'] = api_key
         ENV['INDICO_CLOUD'] = cloud
 
         config = Indico.load_environment_vars()
         expected_auth = Hash.new
@@ -35,24 +39,34 @@
         expected_cloud = Hash.new
         expected_cloud['cloud'] = cloud
 
         expect(config['auth']).to eql(expected_auth)
         expect(config['private_cloud']).to eql(expected_cloud)
+
+        ENV['INDICO_API_KEY'] = saved_api_key
+        ENV['INDICO_CLOUD'] = saved_private_cloud
     end
 
     it 'should combine file and env variable configuration' do
         api_key = 'testapikey'
         cloud = 'cloud'
+
+        saved_api_key = ENV['INDICO_API_KEY']
+        saved_private_cloud = ENV['INDICO_CLOUD']
+
         ENV['INDICO_API_KEY'] = api_key
         ENV['INDICO_CLOUD'] = cloud
 
         expected = Hash.new
         expected['auth'] = api_key
         expected['cloud'] = cloud
 
         config = Indico.load_config()
         expect(config).to eql(expected)
+
+        ENV['INDICO_API_KEY'] = saved_api_key
+        ENV['INDICO_CLOUD'] = saved_private_cloud
     end
 
     it 'should merge configurations properly' do
 
         file_api_key = 'file-api-key'
@@ -63,16 +77,22 @@
         file_config['auth']['api_key'] = file_api_key
         file_config['private_cloud']['cloud'] = file_cloud
 
         env_api_key = 'env-api-key'
         env_cloud = 'env-cloud'
+        saved_api_key = ENV['INDICO_API_KEY'] 
+        saved_private_cloud = ENV['INDICO_CLOUD'] 
+
         ENV['INDICO_API_KEY'] = env_api_key
         ENV['INDICO_CLOUD'] = env_cloud
 
         env_config = Indico.load_environment_vars()
         merged = Indico.merge_config(file_config, env_config)
         expect(merged['auth']['api_key']).to eql(env_api_key)
         expect(merged['private_cloud']['cloud']).to eql(env_cloud)
+
+        ENV['INDICO_API_KEY'] = saved_api_key
+        ENV['INDICO_CLOUD'] = saved_private_cloud 
     end
 
     it 'should set api key with a call to set_api_key' do
         saved_key = Indico.api_key
         Indico.api_key = nil