Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 6 deletions

diff --git a/spec/helpers/icons_helper_spec.rb b/spec/helpers/icons_helper_spec.rb
index f1b1d411e05..5c26db028b7 100644
--- a/spec/helpers/icons_helper_spec.rb
+++ b/spec/helpers/icons_helper_spec.rb
@@ -76,6 +76,8 @@ describe IconsHelper do
       it 'does not raise in production mode' do
         stub_rails_env('production')
 
+        expect(File).not_to receive(:read)
+
         expect { sprite_icon(non_existing) }.not_to raise_error
       end
     end
diff --git a/spec/presenters/ci/pipeline_presenter_spec.rb b/spec/presenters/ci/pipeline_presenter_spec.rb
index eca5d3e05fe..fd391478eb4 100644
--- a/spec/presenters/ci/pipeline_presenter_spec.rb
+++ b/spec/presenters/ci/pipeline_presenter_spec.rb
@@ -62,13 +62,19 @@ describe Ci::PipelinePresenter do
     end
   end
 
-  context '#failure_reason' do
-    context 'when pipeline has failure reason' do
-      it 'represents a failure reason sentence' do
-        pipeline.failure_reason = :config_error
+  describe '#failure_reason' do
+    context 'when pipeline has a failure reason' do
+      ::Ci::PipelineEnums.failure_reasons.keys.each do |failure_reason|
+        context "when failure reason is #{failure_reason}" do
+          before do
+            pipeline.failure_reason = failure_reason
+          end
 
-        expect(presenter.failure_reason)
-          .to eq 'CI/CD YAML configuration error!'
+          it 'represents a failure reason sentence' do
+            expect(presenter.failure_reason).to be_an_instance_of(String)
+            expect(presenter.failure_reason).not_to eq(failure_reason.to_s)
+          end
+        end
       end
     end