Merge branch 'fix-resolved-discussion' into 'master'

Fix unable to expand text diff discussion comments

Closes #38940

See merge request gitlab-org/gitlab-ce!14792

1 files changed, 2 insertions, 6 deletions

diff --git a/spec/features/merge_requests/diffs_spec.rb b/spec/features/merge_requests/diffs_spec.rb
index 80fb7335989..2adca58620f 100644
--- a/spec/features/merge_requests/diffs_spec.rb
+++ b/spec/features/merge_requests/diffs_spec.rb
@@ -44,12 +44,8 @@ feature 'Diffs URL', :js do
         visit "#{diffs_project_merge_request_path(project, merge_request)}#{fragment}"
       end
 
-      it 'shows collapsed note' do
-        wait_for_requests
-
-        expect(page).to have_selector('.discussion-notes.collapsed') do |note_container|
-          expect(note_container).to have_selector(fragment, visible: false)
-        end
+      it 'shows expanded note' do
+        expect(page).to have_selector(fragment, visible: true)
       end
     end
   end