Commit 1949b6bb authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch '208093-align-related-merge-request-icon' into 'master'

Fix vertical misalignment for related mr icon in Vue issues list.

See merge request gitlab-org/gitlab!40923
parents 305f982b 869dcd92
...@@ -158,7 +158,7 @@ export default { ...@@ -158,7 +158,7 @@ export default {
value: this.issuable.merge_requests_count, value: this.issuable.merge_requests_count,
title: __('Related merge requests'), title: __('Related merge requests'),
dataTestId: 'merge-requests', dataTestId: 'merge-requests',
class: 'js-merge-requests icon-merge-request-unmerged', class: 'js-merge-requests',
icon: 'merge-request', icon: 'merge-request',
}, },
{ {
......
...@@ -51,8 +51,8 @@ RSpec.describe 'issuable list', :js do ...@@ -51,8 +51,8 @@ RSpec.describe 'issuable list', :js do
it "counts merge requests closing issues icons for each issue" do it "counts merge requests closing issues icons for each issue" do
visit_issuable_list(:issue) visit_issuable_list(:issue)
expect(page).to have_selector('.icon-merge-request-unmerged', count: 1) expect(page).to have_selector('[data-testid="merge-requests"]', count: 1)
expect(first('.icon-merge-request-unmerged').find(:xpath, '..')).to have_content(1) expect(first('[data-testid="merge-requests"]').find(:xpath, '..')).to have_content(1)
end end
def visit_issuable_list(issuable_type) def visit_issuable_list(issuable_type)
......
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