Ignore nil values in config.env

iain · Aug 20, 2012 · 1f5365b · 1f5365b
1 parent b992e40
commit 1f5365b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/travis/model/env_helpers.rb b/lib/travis/model/env_helpers.rb
@@ -3,7 +3,7 @@ module Model
     module EnvHelpers
       def obfuscate_env(vars)
         vars = [vars] unless vars.is_a?(Array)
-        vars.map do |var|
+        vars.compact.map do |var|
           repository.key.secure.decrypt(var) do |decrypted|
             Travis::Helpers.obfuscate_env_vars(decrypted)
           end

diff --git a/spec/travis/model/build_spec.rb b/spec/travis/model/build_spec.rb
@@ -224,6 +224,13 @@
         }
       end
 
+      it 'works with nil values' do
+        build  = Build.new(:repository => Factory(:repository))
+        build.config = { :rvm => ['1.8.7'] }
+        build.config[:env] = [[nil, {:secure => ''}]]
+        build.obfuscated_config.should == { :rvm => ['1.8.7'], :env =>  [''] }
+      end
+
       it 'does not make an empty env key an array but leaves it empty' do
         build  = Build.new(:repository => Factory(:repository))
         build.config = { :rvm => ['1.8.7'], :env =>  nil }