Merge branch 'gt-fix-styling-for-pages-status-ee' into 'master'

Fix styling for `app/assets/stylesheets/pages/status.scss`

See merge request gitlab-org/gitlab-ee!10858

app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js

@@ -112,7 +112,7 @@ export default class MergeRequestStore {
     this.ciStatus = data.ci_status;
     this.isPipelineFailed = this.ciStatus === 'failed' || this.ciStatus === 'canceled';
     this.isPipelinePassing =
-      this.ciStatus === 'success' || this.ciStatus === 'success_with_warnings';
+      this.ciStatus === 'success' || this.ciStatus === 'success-with-warnings';
     this.isPipelineSkipped = this.ciStatus === 'skipped';
     this.pipelineDetailedStatus = pipelineStatus;
     this.isPipelineActive = data.pipeline ? data.pipeline.active : false;

app/assets/stylesheets/framework/icons.scss

@@ -20,8 +20,8 @@
 }
 
 .ci-status-icon-pending,
-.ci-status-icon-failed_with_warnings,
-.ci-status-icon-success_with_warnings {
+.ci-status-icon-failed-with-warnings,
+.ci-status-icon-success-with-warnings {
   svg {
     fill: $orange-500;
   }

app/assets/stylesheets/pages/pipelines.scss

@@ -785,7 +785,7 @@
   }
 
   &.ci-status-icon-pending,
-  &.ci-status-icon-success_with_warnings {
+  &.ci-status-icon-success-with-warnings {
     @include mini-pipeline-graph-color($white, $orange-100, $orange-200, $orange-500, $orange-600, $orange-700);
   }
 

app/assets/stylesheets/pages/status.scss

@@ -38,8 +38,8 @@
   }
 
   &.ci-pending,
-  &.ci-failed_with_warnings,
-  &.ci-success_with_warnings {
+  &.ci-failed-with-warnings,
+  &.ci-success-with-warnings {
     @include status-color($orange-100, $orange-500, $orange-700);
   }
 

app/helpers/ci_status_helper.rb

@@ -16,7 +16,7 @@ module CiStatusHelper
     label = case status
             when 'success'
               'passed'
-            when 'success_with_warnings'
+            when 'success-with-warnings'
               'passed with warnings'
             when 'manual'
               'waiting for manual action'
@@ -37,7 +37,7 @@ module CiStatusHelper
     case status
     when 'success'
       s_('CiStatusText|passed')
-    when 'success_with_warnings'
+    when 'success-with-warnings'
       s_('CiStatusText|passed')
     when 'manual'
       s_('CiStatusText|blocked')
@@ -71,7 +71,7 @@ module CiStatusHelper
       case status
       when 'success'
         'status_success'
-      when 'success_with_warnings'
+      when 'success-with-warnings'
         'status_warning'
       when 'failed'
         'status_failed'

app/models/project_services/mock_ci_service.rb

@@ -2,7 +2,7 @@
 
 # For an example companion mocking service, see https://gitlab.com/gitlab-org/gitlab-mock-ci-service
 class MockCiService < CiService
-  ALLOWED_STATES = %w[failed canceled running pending success success_with_warnings skipped not_found].freeze
+  ALLOWED_STATES = %w[failed canceled running pending success success-with-warnings skipped not_found].freeze
 
   prop_accessor :mock_service_url
   validates :mock_service_url, presence: true, public_url: true, if: :activated?

app/presenters/merge_request_presenter.rb

@@ -13,7 +13,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
   def ci_status
     if pipeline
       status = pipeline.status
-      status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings?
+      status = "success-with-warnings" if pipeline.success? && pipeline.has_warnings?
 
       status || "preparing"
     else

doc/user/project/integrations/mock_ci.md

@@ -5,7 +5,7 @@
 To set up the mock CI service server, respond to the following endpoints
 
 - `commit_status`: `#{project.namespace.path}/#{project.path}/status/#{sha}.json`
-   - Have your service return `200 { status: ['failed'|'canceled'|'running'|'pending'|'success'|'success_with_warnings'|'skipped'|'not_found'] }`
+   - Have your service return `200 { status: ['failed'|'canceled'|'running'|'pending'|'success'|'success-with-warnings'|'skipped'|'not_found'] }`
    - If the service returns a 404, it is interpreted as `pending`
 - `build_page`: `#{project.namespace.path}/#{project.path}/status/#{sha}`
    - Just where the build is linked to, doesn't matter if implemented

ee/spec/javascripts/pipelines/linked_pipelines_mock.json

@@ -2263,7 +2263,7 @@
               "icon": "status_warning",
               "text": "passed",
               "label": "passed with warnings",
-              "group": "success_with_warnings",
+              "group": "success-with-warnings",
               "tooltip": "passed",
               "has_details": true,
               "details_path": "/h5bp/html5-boilerplate/pipelines/26",
@@ -2828,7 +2828,7 @@
                       "icon": "status_warning",
                       "text": "failed",
                       "label": "failed (allowed to fail)",
-                      "group": "failed_with_warnings",
+                      "group": "failed-with-warnings",
                       "tooltip": "failed - (unknown failure) (allowed to fail)",
                       "has_details": true,
                       "details_path": "/h5bp/html5-boilerplate/-/jobs/537",
@@ -2862,7 +2862,7 @@
                           "icon": "status_warning",
                           "text": "failed",
                           "label": "failed (allowed to fail)",
-                          "group": "failed_with_warnings",
+                          "group": "failed-with-warnings",
                           "tooltip": "failed - (unknown failure) (allowed to fail)",
                           "has_details": true,
                           "details_path": "/h5bp/html5-boilerplate/-/jobs/537",
@@ -2890,7 +2890,7 @@
                   "icon": "status_warning",
                   "text": "passed",
                   "label": "passed with warnings",
-                  "group": "success_with_warnings",
+                  "group": "success-with-warnings",
                   "tooltip": "passed",
                   "has_details": true,
                   "details_path": "/h5bp/html5-boilerplate/pipelines/26#test",
@@ -3503,7 +3503,7 @@
                 "icon": "status_warning",
                 "text": "passed",
                 "label": "passed with warnings",
-                "group": "success_with_warnings",
+                "group": "success-with-warnings",
                 "tooltip": "passed",
                 "has_details": true,
                 "details_path": "/gitlab-org/gitlab-test/pipelines/4",

lib/gitlab/ci/status/build/failed_allowed.rb

@@ -14,7 +14,7 @@ module Gitlab
           end
 
           def group
-            'failed_with_warnings'
+            'failed-with-warnings'
           end
 
           def status_tooltip

lib/gitlab/ci/status/success_warning.rb

@@ -21,7 +21,7 @@ module Gitlab
         end
 
         def group
-          'success_with_warnings'
+          'success-with-warnings'
         end
 
         def self.matches?(subject, user)

spec/javascripts/jobs/mock_data.js

@@ -678,7 +678,7 @@ export const stages = [
           icon: 'status_warning',
           text: 'failed',
           label: 'failed (allowed to fail)',
-          group: 'failed_with_warnings',
+          group: 'failed-with-warnings',
           tooltip: 'failed - (unknown failure) (allowed to fail)',
           has_details: true,
           details_path: '/gitlab-org/gitlab-shell/-/jobs/454',
@@ -710,7 +710,7 @@ export const stages = [
               icon: 'status_warning',
               text: 'failed',
               label: 'failed (allowed to fail)',
-              group: 'failed_with_warnings',
+              group: 'failed-with-warnings',
               tooltip: 'failed - (unknown failure) (allowed to fail)',
               has_details: true,
               details_path: '/gitlab-org/gitlab-shell/-/jobs/454',
@@ -738,7 +738,7 @@ export const stages = [
       icon: 'status_warning',
       text: 'passed',
       label: 'passed with warnings',
-      group: 'success_with_warnings',
+      group: 'success-with-warnings',
       tooltip: 'passed',
       has_details: true,
       details_path: '/gitlab-org/gitlab-shell/pipelines/27#test',

spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js

@@ -36,8 +36,8 @@ describe('MergeRequestStore', () => {
         expect(store.isPipelinePassing).toBe(true);
       });
 
-      it('is true when the CI status is `success_with_warnings`', () => {
-        store.setData({ ...mockData, ci_status: 'success_with_warnings' });
+      it('is true when the CI status is `success-with-warnings`', () => {
+        store.setData({ ...mockData, ci_status: 'success-with-warnings' });
 
         expect(store.isPipelinePassing).toBe(true);
       });

spec/javascripts/vue_shared/components/ci_badge_link_spec.js

@@ -59,7 +59,7 @@ describe('CI Badge Link Component', () => {
     success_warining: {
       text: 'passed',
       label: 'passed',
-      group: 'success_with_warnings',
+      group: 'success-with-warnings',
       icon: 'status_warning',
       details_path: 'status/warning',
     },

spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb

@@ -31,7 +31,7 @@ describe Gitlab::Ci::Status::Build::FailedAllowed do
 
   describe '#group' do
     it 'returns status failed with warnings status group' do
-      expect(subject.group).to eq 'failed_with_warnings'
+      expect(subject.group).to eq 'failed-with-warnings'
     end
   end
 

spec/lib/gitlab/ci/status/success_warning_spec.rb

@@ -20,7 +20,7 @@ describe Gitlab::Ci::Status::SuccessWarning do
   end
 
   describe '#group' do
-    it { expect(subject.group).to eq 'success_with_warnings' }
+    it { expect(subject.group).to eq 'success-with-warnings' }
   end
 
   describe '.matches?' do

spec/presenters/merge_request_presenter_spec.rb

@@ -40,8 +40,8 @@ describe MergeRequestPresenter do
           allow(pipeline).to receive(:has_warnings?) { true }
         end
 
-        it 'returns "success_with_warnings"' do
-          is_expected.to eq('success_with_warnings')
+        it 'returns "success-with-warnings"' do
+          is_expected.to eq('success-with-warnings')
         end
       end