Merge pull request #418 from saucelabs/jwt

Whitelisting jwt and enabling decryption of whitelisted addons

lib/travis/model/job.rb

@@ -122,13 +122,8 @@ def decrypted_config
     normalize_config(self.config).deep_dup.tap do |config|
       config[:env] = process_env(config[:env]) { |env| decrypt_env(env) } if config[:env]
       config[:global_env] = process_env(config[:global_env]) { |env| decrypt_env(env) } if config[:global_env]
-      if config[:addons]
-        if addons_enabled?
-          config[:addons] = decrypt_addons(config[:addons])
-        else
-          delete_addons(config)
-        end
-      end
+      delete_addons(config) if config[:addons] && !addons_enabled?
+      config[:addons] = decrypt_addons(config[:addons]) if config[:addons]
     end
   rescue => e
     logger.warn "[job id:#{id}] Config could not be decrypted due to #{e.message}"
@@ -155,7 +150,7 @@ def result
   private
 
     def whitelisted_addons
-      [:firefox, :hosts, :postgresql]
+      [:firefox, :hosts, :postgresql, :jwt]
     end
 
     def delete_addons(config)

spec/travis/model/job_spec.rb

@@ -348,6 +348,26 @@
           }
         }
       end
+
+      it 'decrypts whitelisted addons', :only => true do
+        config = { rvm: '1.8.7',
+                   addons: {
+                     jwt: {
+                       secret: job.repository.key.secure.encrypt('ABC=foobar')
+                     }
+                   }
+                 }
+        job.config = config
+
+        job.decrypted_config.should == {
+          rvm: '1.8.7',
+          addons: {
+            jwt: {
+              secret: 'ABC=foobar'
+            }
+          }
+        }
+      end
     end
 
     context 'when job has secure env enabled' do