Merge branch 'sh-fix-karma-failures-icons' into 'master'

Fix Karma failures due to invalid icon names

See merge request gitlab-org/gitlab-ce!20887

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",

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",

spec/javascripts/pipelines/graph/dropdown_job_component_spec.js

@@ -12,7 +12,7 @@ describe('dropdown job component', () => {
         id: 4256,
         name: '<img src=x onerror=alert(document.domain)>',
         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',

spec/javascripts/pipelines/graph/job_component_spec.js

@@ -169,7 +169,7 @@ describe('pipeline graph job component', () => {
           id: 4259,
           name: '<img src=x onerror=alert(document.domain)>',
           status: {
-            icon: 'icon_status_success',
+            icon: 'status_success',
             label: 'success',
             tooltip: 'failed',
           },