1 files changed, 23 insertions, 54 deletions

diff --git a/spec/lib/gitlab/email/reply_parser_spec.rb b/spec/lib/gitlab/email/reply_parser_spec.rb
index e4c68dbba92..35065b74eff 100644
--- a/spec/lib/gitlab/email/reply_parser_spec.rb
+++ b/spec/lib/gitlab/email/reply_parser_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 # Inspired in great part by Discourse's Email::Receiver
-RSpec.describe Gitlab::Email::ReplyParser do
+RSpec.describe Gitlab::Email::ReplyParser, feature_category: :team_planning do
   describe '#execute' do
     def test_parse_body(mail_string, params = {})
       described_class.new(Mail::Message.new(mail_string), **params).execute
@@ -188,67 +188,36 @@ RSpec.describe Gitlab::Email::ReplyParser do
         )
     end
 
-    context 'properly renders email reply from gmail web client' do
-      context 'when feature flag is enabled' do
-        it do
-          expect(test_parse_body(fixture_file("emails/html_only.eml")))
-          .to eq(
-            <<-BODY.strip_heredoc.chomp
-              ### This is a reply from standard GMail in Google Chrome.
-
-              The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
-
-              Here's some **bold** text, **strong** text and *italic* in Markdown.
-
-              Here's a link http://example.com
-
-              Here's an img ![Miro](http://img.png)<details>
-              <summary>
-              One</summary>
-              Some details</details>
-
-              <details>
-              <summary>
-              Two</summary>
-              Some details</details>
-
-              Test reply.
-
-              First paragraph.
-
-              Second paragraph.
-            BODY
-          )
-        end
-      end
-
-      context 'when feature flag is disabled' do
-        before do
-          stub_feature_flags(service_desk_html_to_text_email_handler: false)
-        end
+    context 'properly renders email reply from gmail web client', feature_category: :service_desk do
+      it do
+        expect(test_parse_body(fixture_file("emails/html_only.eml")))
+        .to eq(
+          <<-BODY.strip_heredoc.chomp
+            ### This is a reply from standard GMail in Google Chrome.
 
-        it do
-          expect(test_parse_body(fixture_file("emails/html_only.eml")))
-            .to eq(
-              <<-BODY.strip_heredoc.chomp
-                ### This is a reply from standard GMail in Google Chrome.
+            The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
 
-                The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+            Here's some **bold** text, **strong** text and *italic* in Markdown.
 
-                Here's some **bold** text, strong text and italic in Markdown.
+            Here's a link http://example.com
 
-                Here's a link http://example.com
+            Here's an img ![Miro](http://img.png)<details>
+            <summary>
+            One</summary>
+            Some details</details>
 
-                Here's an img [Miro]One Some details Two Some details
+            <details>
+            <summary>
+            Two</summary>
+            Some details</details>
 
-                Test reply.
+            Test reply.
 
-                First paragraph.
+            First paragraph.
 
-                Second paragraph.
-              BODY
-            )
-        end
+            Second paragraph.
+          BODY
+        )
       end
     end