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
9e737261
Commit
9e737261
authored
Oct 24, 2019
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix message matching
parent
397901a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
qa/qa/specs/features/ee/browser_ui/geo/ssh_push_to_secondary_spec.rb
.../features/ee/browser_ui/geo/ssh_push_to_secondary_spec.rb
+2
-2
qa/qa/specs/features/ee/browser_ui/geo/wiki_ssh_push_to_secondary_spec.rb
...ures/ee/browser_ui/geo/wiki_ssh_push_to_secondary_spec.rb
+1
-1
No files found.
qa/qa/specs/features/ee/browser_ui/geo/ssh_push_to_secondary_spec.rb
View file @
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
...
...
qa/qa/specs/features/ee/browser_ui/geo/wiki_ssh_push_to_secondary_spec.rb
View file @
9e737261
...
...
@@ -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
)
...
...
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