Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
15976edf
Commit
15976edf
authored
Sep 16, 2018
by
Ash McKenzie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use helpers where possible
parent
0414226f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
ee/spec/lib/gitlab/geo/git_push_ssh_proxy_spec.rb
ee/spec/lib/gitlab/geo/git_push_ssh_proxy_spec.rb
+5
-3
ee/spec/lib/gitlab/git_access_wiki_spec.rb
ee/spec/lib/gitlab/git_access_wiki_spec.rb
+2
-2
No files found.
ee/spec/lib/gitlab/geo/git_push_ssh_proxy_spec.rb
View file @
15976edf
...
...
@@ -26,10 +26,12 @@ describe Gitlab::Geo::GitPushSSHProxy, :geo do
}
end
let
(
:primary_repo_http
)
{
geo_primary_http_url_to_repo
(
project
)
}
let
(
:data
)
do
{
'gl_id'
=>
"key-
#{
key
.
id
}
"
,
'primary_repo'
=>
"
#{
primary_node
.
url
}#{
project
.
repository
.
full_path
}
.git"
'primary_repo'
=>
primary_repo_http
}
end
...
...
@@ -56,7 +58,7 @@ describe Gitlab::Geo::GitPushSSHProxy, :geo do
context
'against secondary node'
do
let
(
:current_node
)
{
secondary_node
}
let
(
:full_info_refs_url
)
{
"
#{
primary_
node
.
url
}#{
project
.
full_path
}
.git
/info/refs?service=git-receive-pack"
}
let
(
:full_info_refs_url
)
{
"
#{
primary_
repo_http
}
/info/refs?service=git-receive-pack"
}
let
(
:info_refs_headers
)
{
base_headers
.
merge
(
'Content-Type'
=>
'application/x-git-upload-pack-request'
)
}
let
(
:info_refs_http_body_full
)
do
"001f# service=git-receive-pack
...
...
@@ -91,7 +93,7 @@ describe Gitlab::Geo::GitPushSSHProxy, :geo do
context
'against secondary node'
do
let
(
:current_node
)
{
secondary_node
}
let
(
:full_git_receive_pack_url
)
{
"
#{
primary_
node
.
url
}#{
project
.
full_path
}
.git
/git-receive-pack"
}
let
(
:full_git_receive_pack_url
)
{
"
#{
primary_
repo_http
}
/git-receive-pack"
}
let
(
:push_headers
)
do
base_headers
.
merge
(
'Content-Type'
=>
'application/x-git-receive-pack-request'
,
...
...
ee/spec/lib/gitlab/git_access_wiki_spec.rb
View file @
15976edf
...
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
GitAccessWiki
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:
repository
)
}
let
(
:project
)
{
create
(
:project
,
:
wiki_repo
)
}
let
(
:changes
)
{
[
'6f6d7e7ed 570e7b2ab refs/heads/master'
]
}
let
(
:authentication_abilities
)
{
%i[read_project download_code push_code]
}
let
(
:redirected_path
)
{
nil
}
...
...
@@ -17,7 +17,7 @@ describe Gitlab::GitAccessWiki do
allow
(
Gitlab
::
Database
).
to
receive
(
:read_only?
)
{
true
}
end
let
(
:primary_repo_url
)
{
"https://localhost:3000/gitlab/
#{
project
.
full_path
}
.wiki.git"
}
let
(
:primary_repo_url
)
{
geo_primary_http_url_to_repo
(
project
.
wiki
)
}
it_behaves_like
'a read-only GitLab instance'
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment