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
ed94d8d0
Commit
ed94d8d0
authored
Sep 16, 2019
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix expected path
parent
761b6947
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
qa/qa/specs/features/ee/browser_ui/geo/http_push_to_secondary_spec.rb
...features/ee/browser_ui/geo/http_push_to_secondary_spec.rb
+14
-2
No files found.
qa/qa/specs/features/ee/browser_ui/geo/http_push_to_secondary_spec.rb
View file @
ed94d8d0
...
...
@@ -2,6 +2,8 @@
module
QA
context
'Geo'
,
:orchestrated
,
:geo
do
let
(
:git_push_http_path_prefix
)
{
'/-/push_from_secondary'
}
describe
'GitLab Geo HTTP push secondary'
do
let
(
:file_content_primary
)
{
'This is a Geo project! Commit from primary.'
}
let
(
:file_content_secondary
)
{
'This is a Geo project! Commit from secondary.'
}
...
...
@@ -77,9 +79,14 @@ module QA
primary_uri
=
project
.
repository_http_location
.
uri
primary_uri
.
user
=
nil
# The secondary inserts a special path prefix.
# See `Gitlab::Geo::GitPushHttp::PATH_PREFIX`.
path
=
File
.
join
(
git_push_http_path_prefix
,
'\d+'
,
primary_uri
.
path
)
absolute_path
=
primary_uri
.
to_s
.
sub
(
primary_uri
.
path
,
path
)
# The git cli produces the 'warning: redirecting to..' output
# internally.
expect
(
push
.
output
).
to
match
(
/warning: redirecting to
#{
primary_uri
.
to_s
}
/
)
expect
(
push
.
output
).
to
match
(
/warning: redirecting to
#{
absolute_path
}
/
)
# Validate git push worked and new content is visible
Page
::
Project
::
Show
.
perform
do
|
show
|
...
...
@@ -158,9 +165,14 @@ module QA
primary_uri
=
project
.
repository_http_location
.
uri
primary_uri
.
user
=
nil
# The secondary inserts a special path prefix.
# See `Gitlab::Geo::GitPushHttp::PATH_PREFIX`.
path
=
File
.
join
(
git_push_http_path_prefix
,
'\d+'
,
primary_uri
.
path
)
absolute_path
=
primary_uri
.
to_s
.
sub
(
primary_uri
.
path
,
path
)
# The git cli produces the 'warning: redirecting to..' output
# internally.
expect
(
push
.
output
).
to
match
(
/warning: redirecting to
#{
primary_uri
.
to_s
}
/
)
expect
(
push
.
output
).
to
match
(
/warning: redirecting to
#{
absolute_path
}
/
)
expect
(
push
.
output
).
to
match
(
/Locking support detected on remote "
#{
location
.
uri
.
to_s
}
"/
)
# Validate git push worked and new content is visible
...
...
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