Commit 186ac5fa authored by Nick Thomas's avatar Nick Thomas Committed by Stan Hu

Merge branch '4984-broken-master-gitlab-git_access_wiki_spec' into 'master'

Resolve "Broken master: ee/spec/lib/gitlab/git_access_wiki_spec.rb and ee/spec/features/epics/epic_issues_spec.rb"

Closes #4984

See merge request gitlab-org/gitlab-ee!4600
parent 685a3612
......@@ -26,7 +26,7 @@ describe Gitlab::GitAccess do
it 'denies push access with primary present' do
error_message = "You can't push code to a read-only GitLab instance. "\
"Please use the Primary node URL: https://localhost:3000/gitlab/#{project.full_path}.git. Documentation: https://docs.gitlab.com/ee/gitlab-geo/using_a_geo_server.html"
"Please use the Primary node URL: https://localhost:3000/gitlab/#{project.full_path}.git. Documentation: #{EE::Gitlab::GeoGitAccess::GEO_SERVER_DOCS_URL}"
primary_node = create(:geo_node, :primary, url: 'https://localhost:3000/gitlab')
allow(Gitlab::Geo).to receive(:primary).and_return(primary_node)
......
......@@ -30,7 +30,7 @@ describe Gitlab::GitAccessWiki do
it 'denies push access with primary present' do
error_message = "You can't push code to a read-only GitLab instance. Please use the Primary node URL: "\
"https://localhost:3000/gitlab/#{project.full_path}.wiki.git. Documentation: https://docs.gitlab.com/ee/gitlab-geo/using_a_geo_server.html"
"https://localhost:3000/gitlab/#{project.full_path}.wiki.git. Documentation: #{EE::Gitlab::GeoGitAccess::GEO_SERVER_DOCS_URL}"
primary_node = create(:geo_node, :primary, url: 'https://localhost:3000/gitlab')
allow(Gitlab::Geo).to receive(:primary).and_return(primary_node)
......
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