Commit 9ac5338b authored by Filipa Lacerda's avatar Filipa Lacerda

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
parents 97ece0ba eff96b8c
......@@ -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 }
......@@ -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 }
- 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)
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment