Fix pipeline 1321185
What does this MR do and why?
- Fix failed job: rspec unit pg14 7/28
Relate Upstream MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90907/diffs#7062986f9fa8c3e1dc00a64a1979508eeac6bc0e_5_5Failures: 1) EmailsHelper#header_logo there is a brand item with a logo that is a SVG file returns the default header logo Failure/Error: expect(header_logo).to match(default_header_logo) expected "<img alt=\"Jihu GitLab\" src=\"http://test.host/images/mailers/gitlab_logo.png\" width=\"55\" height=\"97\" />" to match /<img alt="Jihu GitLab" src="\/images\/mailers\/gitlab_logo\.(?:gif|png)" width="\d+" height="\d+" \/>/ Diff: @@ -1 +1 @@ -/<img alt="Jihu GitLab" src="\/images\/mailers\/gitlab_logo\.(?:gif|png)" width="\d+" height="\d+" \/>/ +"<img alt=\"Jihu GitLab\" src=\"http://test.host/images/mailers/gitlab_logo.png\" width=\"55\" height=\"97\" />" # ./spec/helpers/emails_helper_spec.rb:248:in `block (5 levels) in <main>'
- No longer skip
branches_spec.rb
as it has been fixed in Upstream MR
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
Before | After |
---|---|
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
由 路志远 编辑于