3 files changed, 27 insertions, 5 deletions
diff --git a/spec/features/discussion_comments/issue_spec.rb b/spec/features/discussion_comments/issue_spec.rb
index 2ad77a2884c..86743e31fbd 100644
--- a/spec/features/discussion_comments/issue_spec.rb
+++ b/spec/features/discussion_comments/issue_spec.rb
@@ -8,6 +8,8 @@ RSpec.describe 'Thread Comments Issue', :js do
   let(:issue) { create(:issue, project: project) }
 
   before do
+    stub_feature_flags(remove_comment_close_reopen: false)
+
     project.add_maintainer(user)
     sign_in(user)
 
diff --git a/spec/features/discussion_comments/merge_request_spec.rb b/spec/features/discussion_comments/merge_request_spec.rb
index 761cc7ae796..82dcdf9f918 100644
--- a/spec/features/discussion_comments/merge_request_spec.rb
+++ b/spec/features/discussion_comments/merge_request_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe 'Thread Comments Merge Request', :js do
 
   before do
     stub_feature_flags(remove_resolve_note: false)
+    stub_feature_flags(remove_comment_close_reopen: false)
 
     project.add_maintainer(user)
     sign_in(user)
diff --git a/spec/features/discussion_comments/snippets_spec.rb b/spec/features/discussion_comments/snippets_spec.rb
index b2d3fbf4b5d..42053e571e9 100644
--- a/spec/features/discussion_comments/snippets_spec.rb
+++ b/spec/features/discussion_comments/snippets_spec.rb
@@ -4,15 +4,34 @@ require 'spec_helper'
 
 RSpec.describe 'Thread Comments Snippet', :js do
   let_it_be(:user) { create(:user) }
-  let_it_be(:project) { create(:project) }
-  let_it_be(:snippet) { create(:project_snippet, :private, :repository, project: project, author: user) }
 
   before do
-    project.add_maintainer(user)
     sign_in(user)
+  end
+
+  context 'with project snippets' do
+    let_it_be(:project) do
+      create(:project).tap do |p|
+        p.add_maintainer(user)
+      end
+    end
+
+    let_it_be(:snippet) { create(:project_snippet, :private, :repository, project: project, author: user) }
+
+    before do
+      visit project_snippet_path(project, snippet)
+    end
 
-    visit project_snippet_path(project, snippet)
+    it_behaves_like 'thread comments', 'snippet'
   end
 
-  it_behaves_like 'thread comments', 'snippet'
+  context 'with personal snippets' do
+    let_it_be(:snippet) { create(:personal_snippet, :private, :repository, author: user) }
+
+    before do
+      visit snippet_path(snippet)
+    end
+
+    it_behaves_like 'thread comments', 'snippet'
+  end
 end