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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
999a0eca
Commit
999a0eca
authored
Feb 20, 2019
by
Tomislav Nikic
Committed by
Mark Lapierre
Feb 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added id to the namespace name generation
Removed quarantine tag from the squash merges test;
parent
b0006630
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
qa/qa/runtime/namespace.rb
qa/qa/runtime/namespace.rb
+3
-1
qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
...er_ui/3_create/merge_request/squash_merge_request_spec.rb
+1
-1
No files found.
qa/qa/runtime/namespace.rb
View file @
999a0eca
...
@@ -8,7 +8,9 @@ module QA
...
@@ -8,7 +8,9 @@ module QA
end
end
def
name
def
name
Runtime
::
Env
.
namespace_name
||
"qa-test-
#{
time
.
strftime
(
'%Y-%m-%d-%H-%M-%S'
)
}
"
# If any changes are made to the name tag, following script has to be considered:
# https://ops.gitlab.net/gitlab-com/gl-infra/traffic-generator/blob/master/bin/janitor.bash
@name
||=
Runtime
::
Env
.
namespace_name
||
"qa-test-
#{
time
.
strftime
(
'%Y-%m-%d-%H-%M-%S'
)
}
-
#{
SecureRandom
.
hex
(
8
)
}
"
end
end
def
path
def
path
...
...
qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
View file @
999a0eca
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
module
QA
module
QA
# Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/31
# Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/31
context
'Create'
,
:quarantine
do
context
'Create'
do
describe
'Merge request squashing'
do
describe
'Merge request squashing'
do
it
'user squashes commits while merging'
do
it
'user squashes commits while merging'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
...
...
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