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
c4218c7f
Commit
c4218c7f
authored
Feb 10, 2022
by
richard.chong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unquarantines the spec to have it start running in Staging again
parent
b0655bf1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
13 deletions
+4
-13
qa/qa/specs/features/ee/browser_ui/4_verify/cancelling_merge_request_in_merge_train_spec.rb
.../4_verify/cancelling_merge_request_in_merge_train_spec.rb
+4
-13
No files found.
qa/qa/specs/features/ee/browser_ui/4_verify/cancelling_merge_request_in_merge_train_spec.rb
View file @
c4218c7f
...
...
@@ -2,8 +2,7 @@
module
QA
RSpec
.
describe
'Verify'
do
# Quarantine at top level due to multiple failures, specified in examples
describe
'Cancelling merge request in merge train'
,
:runner
,
:requires_admin
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/340885'
}
do
describe
'Cancelling merge request in merge train'
,
:runner
,
:requires_admin
do
before
(
:all
)
do
executor
=
"qa-runner-
#{
Faker
::
Alphanumeric
.
alphanumeric
(
8
)
}
"
@file_name
=
Faker
::
File
.
unique
.
file_name
...
...
@@ -89,12 +88,8 @@ module QA
@user
.
remove_via_api!
end
context
'when system cancels the merge request'
do
it
(
'creates a TODO task'
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347666'
,
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/324122'
# type: :bug
)
do
context
'when system cancels the merge request'
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/324122'
,
type: :bug
}
do
it
'creates a TODO task'
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347666'
do
# Create a merge conflict
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
commit
.
api_client
=
@user_api_client
...
...
@@ -127,11 +122,7 @@ module QA
end
context
'when user cancels the merge request'
do
it
(
'does not create a TODO task'
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347665'
,
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/340885'
# type: :flaky
)
do
it
'does not create a TODO task'
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347665'
do
# Manually removes merge request from the train
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
show
.
wait_until
(
reload:
false
)
do
...
...
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