diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-14 11:22:05 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-14 11:22:05 +0100 |
commit | 2beea447def3ad593a697fb3f453ca0aeb44921a (patch) | |
tree | 4590bac4106efb483f35b147199bc10d5713684b | |
parent | 593a92b2dbb6869c4f98ad89e75ccfe806229194 (diff) | |
download | gitlab-ce-30904-mini-pipeline-graph-status-badge-when-updating-in-real-time-don-t-change-color-and-svg-icon.tar.gz |
Review changes30904-mini-pipeline-graph-status-badge-when-updating-in-real-time-don-t-change-color-and-svg-icon
-rw-r--r-- | app/assets/javascripts/ci_status_icons.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/vue_pipelines_index/components/stage.js | 4 | ||||
-rw-r--r-- | spec/javascripts/ci_status_icon_spec.js | 20 |
3 files changed, 24 insertions, 4 deletions
diff --git a/app/assets/javascripts/ci_status_icons.js b/app/assets/javascripts/ci_status_icons.js index 3c98e84ef88..f16616873b2 100644 --- a/app/assets/javascripts/ci_status_icons.js +++ b/app/assets/javascripts/ci_status_icons.js @@ -8,7 +8,7 @@ import SKIPPED_SVG from 'icons/_icon_status_skipped_borderless.svg'; import SUCCESS_SVG from 'icons/_icon_status_success_borderless.svg'; import WARNING_SVG from 'icons/_icon_status_warning_borderless.svg'; -const StatusIconReferenceMap = { +const StatusIconEntityMap = { icon_status_canceled: CANCELED_SVG, icon_status_created: CREATED_SVG, icon_status_failed: FAILED_SVG, @@ -30,5 +30,5 @@ export { SKIPPED_SVG, SUCCESS_SVG, WARNING_SVG, - StatusIconReferenceMap, + StatusIconEntityMap as default, }; diff --git a/app/assets/javascripts/vue_pipelines_index/components/stage.js b/app/assets/javascripts/vue_pipelines_index/components/stage.js index 65718fe4ddd..b8cc3630611 100644 --- a/app/assets/javascripts/vue_pipelines_index/components/stage.js +++ b/app/assets/javascripts/vue_pipelines_index/components/stage.js @@ -1,5 +1,5 @@ /* global Flash */ -import { StatusIconReferenceMap } from '../../ci_status_icons'; +import StatusIconEntityMap from '../../ci_status_icons'; export default { data() { @@ -69,7 +69,7 @@ export default { return `mini-pipeline-graph-dropdown-toggle has-tooltip js-builds-dropdown-button ci-status-icon-${this.stage.status.group}`; }, svgHTML() { - return StatusIconReferenceMap[this.stage.status.icon]; + return StatusIconEntityMap[this.stage.status.icon]; }, }, template: ` diff --git a/spec/javascripts/ci_status_icon_spec.js b/spec/javascripts/ci_status_icon_spec.js index 44dcb7c3aa2..c83416c15ef 100644 --- a/spec/javascripts/ci_status_icon_spec.js +++ b/spec/javascripts/ci_status_icon_spec.js @@ -21,4 +21,24 @@ describe('CI status icons', () => { expect(icons[key]).toMatch(/^<svg/); }); }); + + describe('default export map', () => { + const entityIconNames = [ + 'icon_status_canceled', + 'icon_status_created', + 'icon_status_failed', + 'icon_status_manual', + 'icon_status_pending', + 'icon_status_running', + 'icon_status_skipped', + 'icon_status_success', + 'icon_status_warning', + ]; + + entityIconNames.forEach((iconName) => { + it(`should have a '${iconName}' key`, () => { + expect(Object.hasOwnProperty.call(icons.default, iconName)).toBe(true); + }); + }); + }); }); |