From 59ef3f98406bf86b57662eebbcbed3857a06e171 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 27 Jul 2018 15:35:12 -0700 Subject: [PATCH] Fix Karma failures due to invalid icon names The icon JSON field has been renamed from icon_status_success to status_success. --- .../pipelines/components/graph/dropdown_job_component.vue | 2 +- .../pipelines/components/graph/job_component.vue | 2 +- .../pipelines/graph/dropdown_job_component_spec.js | 6 +++--- spec/javascripts/pipelines/graph/job_component_spec.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue index 14518f86dc7..8487c8036ee 100644 --- a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue @@ -14,7 +14,7 @@ import tooltip from '../../../vue_shared/directives/tooltip'; * "id": 4256, * "name": "test", * "status": { - * "icon": "icon_status_success", + * "icon": "status_success", * "text": "passed", * "label": "passed", * "group": "success", diff --git a/app/assets/javascripts/pipelines/components/graph/job_component.vue b/app/assets/javascripts/pipelines/components/graph/job_component.vue index 84a3d58b770..66f95147193 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_component.vue @@ -13,7 +13,7 @@ import tooltip from '../../../vue_shared/directives/tooltip'; * "id": 4256, * "name": "test", * "status": { - * "icon": "icon_status_success", + * "icon": "status_success", * "text": "passed", * "label": "passed", * "group": "success", diff --git a/spec/javascripts/pipelines/graph/dropdown_job_component_spec.js b/spec/javascripts/pipelines/graph/dropdown_job_component_spec.js index 608a0d4be67..ff584396d61 100644 --- a/spec/javascripts/pipelines/graph/dropdown_job_component_spec.js +++ b/spec/javascripts/pipelines/graph/dropdown_job_component_spec.js @@ -12,7 +12,7 @@ describe('dropdown job component', () => { id: 4256, name: '', status: { - icon: 'icon_status_success', + icon: 'status_success', text: 'passed', label: 'passed', tooltip: 'passed', @@ -31,7 +31,7 @@ describe('dropdown job component', () => { id: 4299, name: 'test', status: { - icon: 'icon_status_success', + icon: 'status_success', text: 'passed', label: 'passed', tooltip: 'passed', @@ -50,7 +50,7 @@ describe('dropdown job component', () => { name: 'rspec:linux', size: 2, status: { - icon: 'icon_status_success', + icon: 'status_success', text: 'passed', label: 'passed', tooltip: 'passed', diff --git a/spec/javascripts/pipelines/graph/job_component_spec.js b/spec/javascripts/pipelines/graph/job_component_spec.js index 59f18d9397d..215ce1e81b5 100644 --- a/spec/javascripts/pipelines/graph/job_component_spec.js +++ b/spec/javascripts/pipelines/graph/job_component_spec.js @@ -169,7 +169,7 @@ describe('pipeline graph job component', () => { id: 4259, name: '', status: { - icon: 'icon_status_success', + icon: 'status_success', label: 'success', tooltip: 'failed', },