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
e7405d7e
Commit
e7405d7e
authored
Nov 15, 2021
by
Andrejs Cunskis
Committed by
Mark Lapierre
Nov 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
E2E: Create top level group via UI on dot_com environment
parent
e10e31d5
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
23 deletions
+23
-23
qa/qa/resource/sandbox.rb
qa/qa/resource/sandbox.rb
+11
-0
qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
...tures/browser_ui/1_manage/group/bulk_import_group_spec.rb
+1
-3
qa/qa/specs/features/ee/browser_ui/1_manage/group/prevent_forking_outside_group_spec.rb
...r_ui/1_manage/group/prevent_forking_outside_group_spec.rb
+2
-4
qa/qa/specs/features/ee/browser_ui/5_package/dependency_proxy_sso_spec.rb
...ures/ee/browser_ui/5_package/dependency_proxy_sso_spec.rb
+7
-10
qa/qa/specs/features/ee/browser_ui/fulfillment/purchase/purchase_ci_spec.rb
...es/ee/browser_ui/fulfillment/purchase/purchase_ci_spec.rb
+1
-1
qa/qa/specs/features/ee/browser_ui/fulfillment/purchase/upgrade_group_spec.rb
.../ee/browser_ui/fulfillment/purchase/upgrade_group_spec.rb
+1
-5
No files found.
qa/qa/resource/sandbox.rb
View file @
e7405d7e
...
@@ -7,6 +7,17 @@ module QA
...
@@ -7,6 +7,17 @@ module QA
# creating it if it doesn't yet exist.
# creating it if it doesn't yet exist.
#
#
class
Sandbox
<
GroupBase
class
Sandbox
<
GroupBase
class
<<
self
# Force top level group creation via UI if test is executed on dot_com environment
def
fabricate!
(
*
args
,
&
prepare_block
)
return
fabricate_via_browser_ui!
(
*
args
,
&
prepare_block
)
if
Specs
::
Helpers
::
ContextSelector
.
dot_com?
fabricate_via_api!
(
*
args
,
&
prepare_block
)
rescue
NotImplementedError
fabricate_via_browser_ui!
(
*
args
,
&
prepare_block
)
end
end
def
initialize
def
initialize
@path
=
Runtime
::
Namespace
.
sandbox_name
@path
=
Runtime
::
Namespace
.
sandbox_name
end
end
...
...
qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
View file @
e7405d7e
...
@@ -22,9 +22,7 @@ module QA
...
@@ -22,9 +22,7 @@ module QA
end
end
let
(
:source_group
)
do
let
(
:source_group
)
do
# top level group can't be created on staging via api, create via UI
Resource
::
Sandbox
.
fabricate!
do
|
group
|
fabricate_method
=
staging?
?
:fabricate_via_browser_ui!
:
:fabricate_via_api!
Resource
::
Sandbox
.
send
(
fabricate_method
)
do
|
group
|
group
.
api_client
=
api_client
group
.
api_client
=
api_client
group
.
path
=
"source-group-for-import-
#{
SecureRandom
.
hex
(
4
)
}
"
group
.
path
=
"source-group-for-import-
#{
SecureRandom
.
hex
(
4
)
}
"
end
end
...
...
qa/qa/specs/features/ee/browser_ui/1_manage/group/prevent_forking_outside_group_spec.rb
View file @
e7405d7e
# frozen_string_literal: true
# frozen_string_literal: true
module
QA
module
QA
# This test is disabled on staging and production due to `top_level_group_creation_enabled` set to false.
RSpec
.
describe
'Manage'
do
# See: https://gitlab.com/gitlab-org/gitlab/-/issues/324808#note_531060031
RSpec
.
describe
'Manage'
,
quarantine:
{
only:
[
:staging
,
:production
],
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/324808'
,
type: :waiting_on
}
do
describe
'prevent forking outside group'
do
describe
'prevent forking outside group'
do
let!
(
:group_for_fork
)
do
let!
(
:group_for_fork
)
do
Resource
::
Sandbox
.
fabricate
_via_api
!
do
|
sandbox_group
|
Resource
::
Sandbox
.
fabricate!
do
|
sandbox_group
|
sandbox_group
.
path
=
"group_for_fork_
#{
SecureRandom
.
hex
(
8
)
}
"
sandbox_group
.
path
=
"group_for_fork_
#{
SecureRandom
.
hex
(
8
)
}
"
end
end
end
end
...
...
qa/qa/specs/features/ee/browser_ui/5_package/dependency_proxy_sso_spec.rb
View file @
e7405d7e
# frozen_string_literal: true
# frozen_string_literal: true
module
QA
module
QA
# This test is disabled on staging and production due to `top_level_group_creation_enabled` set to false.
RSpec
.
describe
'Package'
,
:orchestrated
,
:group_saml
,
:requires_admin
do
# See: https://gitlab.com/gitlab-org/gitlab/-/issues/342329#note_696599160
# When FF enabled, the test is failing with https://gitlab.com/gitlab-org/gitlab/-/issues/342523
RSpec
.
describe
'Package'
,
:orchestrated
,
:group_saml
,
:requires_admin
,
quarantine:
{
only:
[
:staging
,
:production
],
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/342523'
,
type: :investigating
}
do
describe
'Dependency Proxy Group SSO'
do
describe
'Dependency Proxy Group SSO'
do
include
Support
::
API
include
Support
::
API
let!
(
:group
)
do
let!
(
:group
)
do
Resource
::
Sandbox
.
fabricate
_via_api
!
do
|
sandbox_group
|
Resource
::
Sandbox
.
fabricate!
do
|
sandbox_group
|
sandbox_group
.
path
=
"saml_sso_group_with_dependency_proxy_
#{
SecureRandom
.
hex
(
8
)
}
"
sandbox_group
.
path
=
"saml_sso_group_with_dependency_proxy_
#{
SecureRandom
.
hex
(
8
)
}
"
end
end
end
end
...
@@ -127,7 +124,7 @@ module QA
...
@@ -127,7 +124,7 @@ module QA
end
end
def
visit_group_sso_url
def
visit_group_sso_url
Runtime
::
Logger
.
debug
(
%
Q[Visiting managed_group_url at "
#{
group_sso_url
}
"]
)
Runtime
::
Logger
.
debug
(
%
(Visiting managed_group_url at "#{group_sso_url}")
)
page
.
visit
group_sso_url
page
.
visit
group_sso_url
Support
::
Waiter
.
wait_until
{
current_url
==
group_sso_url
}
Support
::
Waiter
.
wait_until
{
current_url
==
group_sso_url
}
...
...
qa/qa/specs/features/ee/browser_ui/fulfillment/purchase/purchase_ci_spec.rb
View file @
e7405d7e
...
@@ -15,7 +15,7 @@ module QA
...
@@ -15,7 +15,7 @@ module QA
end
end
let
(
:group
)
do
let
(
:group
)
do
Resource
::
Sandbox
.
fabricate
_via_api
!
do
|
sandbox
|
Resource
::
Sandbox
.
fabricate!
do
|
sandbox
|
sandbox
.
path
=
"gitlab-qa-group-
#{
hash
}
"
sandbox
.
path
=
"gitlab-qa-group-
#{
hash
}
"
sandbox
.
api_client
=
Runtime
::
API
::
Client
.
as_admin
sandbox
.
api_client
=
Runtime
::
API
::
Client
.
as_admin
end
end
...
...
qa/qa/specs/features/ee/browser_ui/fulfillment/purchase/upgrade_group_spec.rb
View file @
e7405d7e
...
@@ -17,15 +17,13 @@ module QA
...
@@ -17,15 +17,13 @@ module QA
# after the test runs since GitLab will not allow deletion of a group
# after the test runs since GitLab will not allow deletion of a group
# that has a Subscription attached
# that has a Subscription attached
let
(
:group
)
do
let
(
:group
)
do
Resource
::
Sandbox
.
fabricate
_via_api
!
do
|
sandbox
|
Resource
::
Sandbox
.
fabricate!
do
|
sandbox
|
sandbox
.
path
=
"gitlab-qa-group-
#{
hash
}
"
sandbox
.
path
=
"gitlab-qa-group-
#{
hash
}
"
sandbox
.
api_client
=
Runtime
::
API
::
Client
.
as_admin
sandbox
.
api_client
=
Runtime
::
API
::
Client
.
as_admin
end
end
end
end
before
do
before
do
Runtime
::
Feature
.
enable
(
:top_level_group_creation_enabled
)
group
.
add_member
(
user
,
Resource
::
Members
::
AccessLevel
::
OWNER
)
group
.
add_member
(
user
,
Resource
::
Members
::
AccessLevel
::
OWNER
)
Flow
::
Login
.
sign_in
(
as:
user
)
Flow
::
Login
.
sign_in
(
as:
user
)
...
@@ -34,8 +32,6 @@ module QA
...
@@ -34,8 +32,6 @@ module QA
after
do
after
do
user
.
remove_via_api!
user
.
remove_via_api!
Runtime
::
Feature
.
disable
(
:top_level_group_creation_enabled
)
end
end
it
'upgrades from free to ultimate'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1882'
do
it
'upgrades from free to ultimate'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1882'
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