Merge branch '47007-related-merge-requests-in-issue-design-restyle' into 'master'

Resolve "Related merge requests in issue design - Restyle"

Closes #47007

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

2 files changed, 4 insertions, 2 deletions

diff --git a/spec/features/issuables/markdown_references/internal_references_spec.rb b/spec/features/issuables/markdown_references/internal_references_spec.rb
index 9613e22bf24..23385ba65fc 100644
--- a/spec/features/issuables/markdown_references/internal_references_spec.rb
+++ b/spec/features/issuables/markdown_references/internal_references_spec.rb
@@ -64,11 +64,13 @@ describe "Internal references", :js do
 
           it "shows references" do
             page.within("#merge-requests .merge-requests-title") do
-              expect(page).to have_content("1 Related Merge Request")
+              expect(page).to have_content("Related merge requests")
+              expect(page).to have_css(".mr-count-badge")
             end
 
             page.within("#merge-requests ul") do
               expect(page).to have_content(private_project_merge_request.title)
+              expect(page).to have_css(".merge-request-status")
             end
 
             expect(page).to have_content("mentioned in merge request #{private_project_merge_request.to_reference(public_project)}")
diff --git a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
index 32bc851f00f..693ad89069c 100644
--- a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
+++ b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
@@ -141,7 +141,7 @@ describe 'User creates branch and merge request on issue page', :js do
       it 'disables the create branch button' do
         expect(page).to have_css('.create-mr-dropdown-wrap .unavailable:not(.hidden)')
         expect(page).to have_css('.create-mr-dropdown-wrap .available.hidden', visible: false)
-        expect(page).to have_content /1 Related Merge Request/
+        expect(page).to have_content /Related merge requests/
       end
     end