diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index 3f3a3b68..4bed6378 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -34,8 +34,11 @@ require 'travis/model' ).property('log.workerName') configValues: (-> - if config = @get('config') - $.values($.only.apply(config, Travis.CONFIG_KEYS)) + config = @get('config') + buildConfig = @get('build.config') + if config && buildConfig + keys = $.intersect($.keys(buildConfig), Travis.CONFIG_KEYS) + keys.map (key) -> config[key] else [] ).property('config') diff --git a/assets/scripts/spec/unit/job_spec.coffee b/assets/scripts/spec/unit/job_spec.coffee new file mode 100644 index 00000000..6f0f264a --- /dev/null +++ b/assets/scripts/spec/unit/job_spec.coffee @@ -0,0 +1,44 @@ +store = null + +describe 'Travis.Job', -> + beforeEach -> + store = Travis.Store.create() + + afterEach -> + store.destroy() + + describe 'with different number of config keys in sibling jobs', -> + beforeEach -> + buildAttrs = + id: 1 + job_ids: [1, 2] + config: + jdk: ['oraclejdk7'] + rvm: ['jruby-head'] + + store.load Travis.Build, 1, buildAttrs + + jobAttrs = + id: 1 + build_id: 1 + config: + jdk: 'oraclejdk7' + rvm: 'jruby-head' + + store.load Travis.Job, 1, jobAttrs + + jobAttrs = + id: 2 + build_id: 1 + config: + jdk: null + rvm: 'jruby-head' + + store.load Travis.Job, 2, jobAttrs + + it 'returns config values for all keys available on build', -> + job1 = store.find Travis.Job, 1 + job2 = store.find Travis.Job, 2 + + expect( job1.get('configValues') ).toEqual ['oraclejdk7', 'jruby-head'] + expect( job2.get('configValues') ).toEqual [undefined, 'jruby-head'] diff --git a/public/scripts/app.js b/public/scripts/app.js index c6777078..3e6059a4 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -30140,4 +30140,4 @@ var _require=function(){function c(a,c){document.addEventListener?a.addEventList ++g&&setTimeout(c,0)})}}(); (function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}: function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(Pusher.Transport=null,Pusher.TransportType="none",Pusher.ready())}}(),e=function(a){var b=function(){document.body?a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})(); -;minispade.register('app', "(function() {(function() {\nminispade.require('auth');\nminispade.require('controllers');\nminispade.require('helpers');\nminispade.require('models');\nminispade.require('pusher');\nminispade.require('routes');\nminispade.require('slider');\nminispade.require('store');\nminispade.require('tailing');\nminispade.require('templates');\nminispade.require('views');\nminispade.require('config/locales');\nminispade.require('data/sponsors');\n\n Travis.reopen({\n App: Em.Application.extend({\n autoinit: false,\n currentUserBinding: 'auth.user',\n authStateBinding: 'auth.state',\n init: function() {\n this._super.apply(this, arguments);\n this.store = Travis.Store.create();\n this.store.loadMany(Travis.Sponsor, Travis.SPONSORS);\n this.slider = new Travis.Slider();\n this.pusher = new Travis.Pusher(Travis.config.pusher_key);\n this.tailing = new Travis.Tailing();\n return this.set('auth', Travis.Auth.create({\n app: this,\n endpoint: Travis.config.api_endpoint\n }));\n },\n storeAfterSignInPath: function(path) {\n return this.get('auth').storeAfterSignInPath(path);\n },\n autoSignIn: function(path) {\n return this.get('auth').autoSignIn(path);\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('afterSignOut');\n },\n receive: function() {\n return this.store.receive.apply(this.store, arguments);\n },\n toggleSidebar: function() {\n var element;\n $('body').toggleClass('maximized');\n element = $('');\n $('#top .profile').append(element);\n Em.run.later((function() {\n return element.remove();\n }), 10);\n element = $('');\n $('#repo').append(element);\n return Em.run.later((function() {\n return element.remove();\n }), 10);\n }\n })\n });\n\n}).call(this);\n\n})();\n//@ sourceURL=app");minispade.register('auth', "(function() {(function() {\n\n this.Travis.Auth = Ember.Object.extend({\n iframe: $('