Commit 6503f801 authored by Ramya Authappan's avatar Ramya Authappan

Merge branch 'mk/fix-geo-ssh-push-qa-tests' into 'master'

Fix Geo QA ssh_push_to_secondary_spec and wiki_ssh_push_to_secondary_spec

Closes #34879, #34878, and #34876

See merge request gitlab-org/gitlab!19120
parents 6d33980e 9e737261
......@@ -96,7 +96,7 @@ module QA
# as ssh:// can appear depending on how GitLab is configured.
ssh_uri = project.repository_ssh_location.git_uri.to_s.gsub(%r{ssh://}, '')
expect(push.output).to match(%r{GitLab: We'll help you by proxying this request to the primary: (?:ssh://)?#{ssh_uri}})
expect(push.output).to match(%r{We'll help you by proxying this.*request to the primary:.*#{ssh_uri}}m)
# Validate git push worked and new content is visible
Page::Project::Show.perform do |show|
......@@ -188,7 +188,7 @@ module QA
end
ssh_uri = project.repository_ssh_location.git_uri.to_s.gsub(%r{ssh://}, '')
expect(push.output).to match(%r{GitLab: We'll help you by proxying this request to the primary: (?:ssh://)?#{ssh_uri}})
expect(push.output).to match(%r{We'll help you by proxying this.*request to the primary:.*#{ssh_uri}}m)
expect(push.output).to match(/Locking support detected on remote "#{location.uri.to_s}"/)
# Validate git push worked and new content is visible
......
......@@ -96,7 +96,7 @@ module QA
# as ssh:// can appear depending on how GitLab is configured.
ssh_uri = wiki.repository_ssh_location.git_uri.to_s.gsub(%r{ssh://}, '')
expect(push.output).to have_content(%r{GitLab: We'll help you by proxying this request to the primary: #{ssh_uri}})
expect(push.output).to match(%r{We'll help you by proxying this.*request to the primary:.*#{ssh_uri}}m)
# Validate git push worked and new content is visible
Page::Project::Menu.perform(&:click_wiki)
......
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