Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 6 insertions, 4 deletions

diff --git a/qa/qa/resource/group.rb b/qa/qa/resource/group.rb
index 9d1a6868562..f53bb531d9a 100644
--- a/qa/qa/resource/group.rb
+++ b/qa/qa/resource/group.rb
@@ -18,7 +18,7 @@ module QA
       end
 
       attribute :sandbox do
-        if QA::Support::FIPS.enabled?
+        if Runtime::Env.personal_access_tokens_disabled?
           Resource::Sandbox.fabricate! do |sandbox|
             sandbox.path = Runtime::Namespace.sandbox_name
           end
@@ -40,9 +40,7 @@ module QA
         sandbox.visit!
 
         Page::Group::Show.perform do |group_show|
-          if group_show.has_subgroup?(path)
-            group_show.click_subgroup(path)
-          else
+          unless group_show.has_subgroup?(path)
             group_show.go_to_new_subgroup
 
             Page::Group::New.perform do |group_new|
@@ -56,7 +54,11 @@ module QA
               group_show.has_text?(path) &&
                 group_show.has_new_project_and_new_subgroup_buttons?
             end
+            sandbox.visit!
           end
+
+          group_show.click_subgroup(path)
+          @id = group_show.group_id
         end
       end