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

app/views/discussions/_diff_discussion.html.haml

@@ -7,4 +7,4 @@
     %td.notes_line{ colspan: 2 }
     %td.notes_content
       .content{ class: ('hide' unless expanded) }
-        = render partial: "discussions/notes", collection: discussions, as: :discussion
+        = render partial: "discussions/notes", collection: discussions, as: :discussion, locals: { disable_collapse_class: true }

app/views/discussions/_diff_with_notes.html.haml

@@ -24,4 +24,4 @@
     = render partial: "projects/diffs/#{partial}", locals: { diff_file: diff_file, position: discussion.position.to_json, click_to_comment: false }
 
     .note-container
-      = render partial: "discussions/notes", locals: { discussion: discussion, show_toggle: false, show_image_comment_badge: true, disable_collapse: true }
+      = render partial: "discussions/notes", locals: { discussion: discussion, show_toggle: false, show_image_comment_badge: true, disable_collapse_class: true }

app/views/discussions/_notes.html.haml

-- disable_collapse = local_assigns.fetch(:disable_collapse, false)
-- collapsed_class = 'collapsed' if discussion.resolved? && !disable_collapse
+- disable_collapse_class = local_assigns.fetch(:disable_collapse_class, false)
+- collapsed_class = 'collapsed' if discussion.resolved? && !disable_collapse_class
 - badge_counter = discussion_counter + 1 if local_assigns[:discussion_counter]
 - show_toggle = local_assigns.fetch(:show_toggle, true)
 - show_image_comment_badge = local_assigns.fetch(:show_image_comment_badge, false)

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