diff options
| author | jerasmus <jerasmus@gitlab.com> | 2019-04-01 12:22:10 +0200 |
|---|---|---|
| committer | Tiger <twatson@gitlab.com> | 2019-04-02 11:07:06 +1100 |
| commit | 506a0ee646d6e600a83cc589abc5543166347b06 (patch) | |
| tree | cb029ef47d9865826b6e0f8dd285c40c7a5fc1d2 | |
| parent | 11f2ddf021ef86d481f68ee6a1e09b57fd18dcae (diff) | |
| download | gitlab-ce-506a0ee646d6e600a83cc589abc5543166347b06.tar.gz | |
Fix frontend unit tests
Fixed the broken frontend unit tests
| -rw-r--r-- | app/assets/javascripts/jobs/components/job_app.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/jobs/store/getters.js | 4 | ||||
| -rw-r--r-- | spec/javascripts/jobs/components/job_app_spec.js | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index 689d1cb97c7..06750a34c77 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -218,7 +218,7 @@ export default { /> </div> - <callout v-if="shouldRenderCalloutMessage" :message="job.callout_message" /> + <callout v-if="shouldRenderCalloutMessage && !hasUnmetPrerequisitesFailure" :message="job.callout_message" /> </header> <!-- EO Header Section --> diff --git a/app/assets/javascripts/jobs/store/getters.js b/app/assets/javascripts/jobs/store/getters.js index 8c09fb0cfe1..406b1a2e375 100644 --- a/app/assets/javascripts/jobs/store/getters.js +++ b/app/assets/javascripts/jobs/store/getters.js @@ -7,9 +7,7 @@ export const hasUnmetPrerequisitesFailure = state => state.job && state.job.failure_reason && state.job.failure_reason === 'unmet_prerequisites'; export const shouldRenderCalloutMessage = state => - !_.isEmpty(state.job.status) && - !_.isEmpty(state.job.callout_message) && - !hasUnmetPrerequisitesFailure; + !_.isEmpty(state.job.status) && !_.isEmpty(state.job.callout_message); /** * When job has not started the key will be null diff --git a/spec/javascripts/jobs/components/job_app_spec.js b/spec/javascripts/jobs/components/job_app_spec.js index 6117eb8cff5..cef40117304 100644 --- a/spec/javascripts/jobs/components/job_app_spec.js +++ b/spec/javascripts/jobs/components/job_app_spec.js @@ -272,8 +272,8 @@ describe('Job App ', () => { title: 'Failed to create resources', }, }, + failure_reason: 'unmet_prerequisites', has_trace: false, - unmet_prerequisites: true, runners: { available: true, }, |