diff --git a/app/components/jobs-item.coffee b/app/components/jobs-item.coffee index ca085418..d2a60524 100644 --- a/app/components/jobs-item.coffee +++ b/app/components/jobs-item.coffee @@ -15,7 +15,18 @@ JobsItemComponent = Ember.Component.extend if version = config[key] output.push(languageName + ': ' + version) + gemfile = @get('job.config.gemfile') + if gemfile && @get('job.config.env') + output.push "Gemfile: #{gemfile}" + output.join(' ') ).property('job.config') + environment: (-> + if env = @get('job.config.env') + env + else if gemfile = @get('job.config.gemfile') + "Gemfile: #{gemfile}" + ).property('job.config.env', 'job.config.gemfile') + `export default JobsItemComponent` diff --git a/app/templates/components/jobs-item.hbs b/app/templates/components/jobs-item.hbs index e6ec8359..cb4aaf2d 100644 --- a/app/templates/components/jobs-item.hbs +++ b/app/templates/components/jobs-item.hbs @@ -25,10 +25,10 @@ {{/if}}
- {{job.config.env}} + {{environment}}
{{else}}diff --git a/tests/unit/components/jobs-item-test.coffee b/tests/unit/components/jobs-item-test.coffee index 31f0e9aa..39e91d80 100644 --- a/tests/unit/components/jobs-item-test.coffee +++ b/tests/unit/components/jobs-item-test.coffee @@ -37,3 +37,40 @@ test 'ouputs info on not set properties', -> ok component.$('.job-env').text().match(/no environment variables set/), 'a message for no env vars should be displayed' ok component.$('.job-lang').text().match(/no language set/), 'a message about no language being set should be displayed' + +test 'when env is not set, gemfile is displayed in the env section', -> + attributes = { + id: 10 + state: 'passed' + number: '2' + config: { + rvm: '2.1.2' + gemfile: 'foo/Gemfile' + }, + duration: 100 + } + job = Ember.Object.create(attributes) + component = @subject(job: job) + @append() + + equal component.$('.job-lang').text().trim(), 'Ruby: 2.1.2', 'langauges list should be displayed' + equal component.$('.job-env').text().trim(), 'Gemfile: foo/Gemfile', 'env should be displayed' + +test 'when env is set, gemfile is displayed in the language section', -> + attributes = { + id: 10 + state: 'passed' + number: '2' + config: { + rvm: '2.1.2' + gemfile: 'foo/Gemfile' + env: 'FOO=bar' + }, + duration: 100 + } + job = Ember.Object.create(attributes) + component = @subject(job: job) + @append() + + equal component.$('.job-lang').text().trim(), 'Ruby: 2.1.2 Gemfile: foo/Gemfile', 'Gemfile should be displayed in languages section' + equal component.$('.job-env').text().trim(), 'FOO=bar', 'env should be displayed'