Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 0 deletions

diff --git a/qa/spec/specs/helpers/quarantine_spec.rb b/qa/spec/specs/helpers/quarantine_spec.rb
index 2538632c032..d5c6820f0a9 100644
--- a/qa/spec/specs/helpers/quarantine_spec.rb
+++ b/qa/spec/specs/helpers/quarantine_spec.rb
@@ -155,6 +155,26 @@ describe QA::Specs::Helpers::Quarantine do
 
         expect(group.examples.first.execution_result.status).to eq(:passed)
       end
+
+      context 'quarantine message' do
+        shared_examples 'test with quarantine message' do |quarantine_tag|
+          it 'outputs the quarantine message' do
+            group = describe_successfully do
+              it('is quarantined', quarantine: quarantine_tag) {}
+            end
+
+            expect(group.examples.first.execution_result.pending_message)
+              .to eq('In quarantine : for a reason')
+          end
+        end
+
+        it_behaves_like 'test with quarantine message', 'for a reason'
+
+        it_behaves_like 'test with quarantine message', {
+          issue: 'for a reason',
+          environment: [:nightly, :staging]
+        }
+      end
     end
 
     context 'with :quarantine focused' do