Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 7 insertions, 0 deletions

diff --git a/qa/qa/page/profile/two_factor_auth.rb b/qa/qa/page/profile/two_factor_auth.rb
index 63593bf0482..16aa60262d8 100644
--- a/qa/qa/page/profile/two_factor_auth.rb
+++ b/qa/qa/page/profile/two_factor_auth.rb
@@ -23,7 +23,14 @@ module QA
         end
 
         def click_configure_it_later_button
+          # TO DO: Investigate why button does not appear sometimes:
+          # https://gitlab.com/gitlab-org/gitlab/-/issues/382698
+          return unless has_element?(:configure_it_later_button)
+
           click_element :configure_it_later_button
+          wait_until(max_duration: 10, message: "Waiting for create a group page") do
+            has_text?("Welcome to GitLab") && has_text?("Create a group")
+          end
         end
 
         def otp_secret_content