Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 8 deletions

diff --git a/qa/qa/page/component/note.rb b/qa/qa/page/component/note.rb
index 5ac72d73c78..0454042289b 100644
--- a/qa/qa/page/component/note.rb
+++ b/qa/qa/page/component/note.rb
@@ -122,13 +122,17 @@ module QA
 
         def select_all_activities_filter
           select_filter_with_text('Show all activity')
+
+          wait_until do
+            has_no_element?(:discussion_filter_container) && has_element?(:comment_field)
+          end
         end
 
         def select_comments_only_filter
           select_filter_with_text('Show comments only')
 
           wait_until do
-            has_no_element?(:system_note_content)
+            has_no_element?(:discussion_filter_container) && has_no_element?(:system_note_content)
           end
         end
 
@@ -145,6 +149,8 @@ module QA
           click_element :note_dropdown
           click_element :discussion_menu_item
           click_element :comment_button
+
+          has_comment?(text)
         end
 
         def toggle_comments(position)
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb
index 22157d648ca..6ed204a98d4 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb
@@ -4,22 +4,20 @@ module QA
   RSpec.describe 'Plan', :reliable do
     describe 'collapse comments in issue discussions' do
       let(:my_first_reply) { 'My first reply' }
+      let(:one_reply) { '1 reply' }
+      let(:issue) { Resource::Issue.fabricate_via_api! }
 
       before do
         Flow::Login.sign_in
 
-        Resource::Issue.fabricate_via_api!.visit!
+        issue.visit!
+      end
 
+      it 'collapses and expands reply for comments in an issue', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/434' do
         Page::Project::Issue::Show.perform do |show|
           show.select_all_activities_filter
           show.start_discussion('My first discussion')
           show.reply_to_discussion(1, my_first_reply)
-        end
-      end
-
-      it 'collapses and expands reply for comments in an issue', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/434' do
-        Page::Project::Issue::Show.perform do |show|
-          one_reply = "1 reply"
 
           show.collapse_replies
           expect(show).to have_content(one_reply)