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
cb8edefd
Commit
cb8edefd
authored
Dec 15, 2021
by
Andrejs Cunskis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
E2E: Remove explicit failure object validation in group import specs
parent
4a57a0d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb
qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb
+6
-7
qa/qa/specs/features/ee/api/1_manage/bulk_import_group_spec.rb
.../specs/features/ee/api/1_manage/bulk_import_group_spec.rb
+7
-4
No files found.
qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb
View file @
cb8edefd
...
...
@@ -4,7 +4,7 @@ module QA
# run only base UI validation on staging because test requires top level group creation which is problematic
# on staging environment
RSpec
.
describe
'Manage'
,
:requires_admin
,
except:
{
subdomain: :staging
}
do
describe
'
Bulk group import
'
do
describe
'
Gitlab migration
'
do
let
(
:import_wait_duration
)
{
{
max_duration:
300
,
sleep_interval:
2
}
}
let
(
:admin_api_client
)
{
Runtime
::
API
::
Client
.
as_admin
}
let
(
:user
)
do
...
...
@@ -46,7 +46,11 @@ module QA
sandbox
.
add_member
(
user
,
Resource
::
Members
::
AccessLevel
::
MAINTAINER
)
end
after
do
after
do
|
example
|
# Checking for failures in the test currently makes test very flaky due to catching unrelated failures
# Just log in case of failure until cause of network errors is found
# See: https://gitlab.com/gitlab-org/gitlab/-/issues/346500
Runtime
::
Logger
.
warn
(
import_failures
)
if
example
.
exception
&&
!
import_failures
.
empty?
user
.
remove_via_api!
end
...
...
@@ -94,8 +98,6 @@ module QA
expect
(
imported_subgroup
.
reload!
).
to
eq
(
subgroup
)
expect
(
imported_subgroup
.
labels
).
to
include
(
*
subgroup
.
labels
)
expect
(
import_failures
).
to
be_empty
,
"Expected no errors, received:
#{
import_failures
}
"
end
end
end
...
...
@@ -135,8 +137,6 @@ module QA
expect
(
imported_milestone
.
updated_at
).
to
eq
(
source_milestone
.
updated_at
)
expect
(
imported_group
.
badges
).
to
eq
(
source_group
.
badges
)
expect
(
import_failures
).
to
be_empty
,
"Expected no errors, received:
#{
import_failures
}
"
end
end
end
...
...
@@ -171,7 +171,6 @@ module QA
aggregate_failures
do
expect
(
imported_member
).
not_to
be_nil
expect
(
imported_member
.
access_level
).
to
eq
(
Resource
::
Members
::
AccessLevel
::
DEVELOPER
)
expect
(
import_failures
).
to
be_empty
,
"Expected no errors, received:
#{
import_failures
}
"
end
end
end
...
...
qa/qa/specs/features/ee/api/1_manage/bulk_import_group_spec.rb
View file @
cb8edefd
...
...
@@ -3,7 +3,7 @@
module
QA
# Do not run on staging since another top level group has to be created which doesn't have premium license
RSpec
.
describe
'Manage'
,
:requires_admin
,
except:
{
subdomain: :staging
}
do
describe
'
Bulk group import
'
do
describe
'
Gitlab migration
'
do
let
(
:admin_api_client
)
{
Runtime
::
API
::
Client
.
as_admin
}
let
(
:api_client
)
{
Runtime
::
API
::
Client
.
new
(
user:
user
)
}
# validate different epic author is migrated correctly
...
...
@@ -95,7 +95,12 @@ module QA
imported_group
# trigger import
end
after
do
after
do
|
example
|
# Checking for failures in the test currently makes test very flaky due to catching unrelated failures
# Just log in case of failure until cause of network errors is found
# See: https://gitlab.com/gitlab-org/gitlab/-/issues/346500
Runtime
::
Logger
.
warn
(
import_failures
)
if
example
.
exception
&&
!
import_failures
.
empty?
user
.
remove_via_api!
author
.
remove_via_api!
end
...
...
@@ -122,8 +127,6 @@ module QA
expect
(
imported_iteration
.
iid
).
to
eq
(
source_iteration
.
iid
)
expect
(
imported_iteration
.
created_at
).
to
eq
(
source_iteration
.
created_at
)
expect
(
imported_iteration
.
updated_at
).
to
eq
(
source_iteration
.
updated_at
)
expect
(
import_failures
).
to
be_empty
,
"Expected no errors, received:
#{
import_failures
}
"
end
end
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