summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorSanad Liaquat <sliaquat@gitlab.com>2019-08-23 07:23:29 +0000
committerSanad Liaquat <sliaquat@gitlab.com>2019-08-23 07:23:29 +0000
commit8634cca30083746e44121ccef060fd11f548f672 (patch)
tree55f358b3e8f12fe7947a82f5521e00bcb243e111 /qa
parentfa866ccb98a13fe137c30962cea56666e97fb296 (diff)
parent095768be4fd5aad0f46d7e57c3c97ab347277253 (diff)
downloadgitlab-ce-8634cca30083746e44121ccef060fd11f548f672.tar.gz
Merge branch 'qa-ml-fix-view-commit-patch-test' into 'master'
Resolve "Failure in qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb" Closes gitlab-org/quality/staging#69 See merge request gitlab-org/gitlab-ce!32087
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
index f915d412bf3..21785ca3ed3 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
@@ -49,7 +49,7 @@ module QA
Page::Project::Commit::Show.perform(&:select_email_patches)
- expect(page).to have_content("From: #{@user.name} <#{@user.public_email}>")
+ expect(page).to have_content(/From: "?#{Regexp.escape(@user.name)}"? <#{@user.public_email}>/)
expect(page).to have_content('Subject: [PATCH] Add second file')
expect(page).to have_content('diff --git a/second b/second')
end