Add latest changes from gitlab-org/gitlab@master

4 files changed, 12 insertions, 3 deletions

diff --git a/qa/qa/flow/user_onboarding.rb b/qa/qa/flow/user_onboarding.rb
index 62397d5641d..8c6a50f251f 100644
--- a/qa/qa/flow/user_onboarding.rb
+++ b/qa/qa/flow/user_onboarding.rb
@@ -10,6 +10,7 @@ module QA
           if welcome_page.has_get_started_button?
             welcome_page.select_role('Other')
             welcome_page.choose_setup_for_company_if_available
+            welcome_page.choose_create_a_new_project_if_available
             welcome_page.click_get_started_button
           end
         end
diff --git a/qa/qa/page/registration/welcome.rb b/qa/qa/page/registration/welcome.rb
index 660b33b4f5b..77cdbe8fd9e 100644
--- a/qa/qa/page/registration/welcome.rb
+++ b/qa/qa/page/registration/welcome.rb
@@ -21,6 +21,10 @@ module QA
           # Only implemented in EE
         end
 
+        def choose_create_a_new_project_if_available
+          # Only implemented in EE
+        end
+
         def click_get_started_button
           Support::Retrier.retry_until do
             click_element :get_started_button
diff --git a/qa/qa/resource/user.rb b/qa/qa/resource/user.rb
index 0398509396f..16d0f6ad380 100644
--- a/qa/qa/resource/user.rb
+++ b/qa/qa/resource/user.rb
@@ -12,7 +12,8 @@ module QA
                     :extern_uid,
                     :expect_fabrication_success,
                     :hard_delete_on_api_removal,
-                    :access_level
+                    :access_level,
+                    :email_domain
 
       attributes :id,
                  :name,
@@ -25,6 +26,7 @@ module QA
         @hard_delete_on_api_removal = false
         @unique_id = SecureRandom.hex(8)
         @expect_fabrication_success = true
+        @email_domain = 'example.com'
       end
 
       def self.default
@@ -63,7 +65,7 @@ module QA
       def email
         @email ||= begin
           api_email = api_resource&.dig(:email)
-          api_email && !api_email.empty? ? api_email : "#{username}@example.com"
+          api_email && !api_email.empty? ? api_email : "#{username}@#{email_domain}"
         end
       end
 
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
index e0242008785..c92bea7bf76 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
@@ -5,7 +5,9 @@ module QA
     it 'allows the user to register and login' do
       Runtime::Browser.visit(:gitlab, Page::Main::Login)
 
-      Resource::User.fabricate_via_browser_ui!
+      Resource::User.fabricate_via_browser_ui! do |user_resource|
+        user_resource.email_domain = 'gitlab.com'
+      end
 
       Page::Main::Menu.perform do |menu|
         expect(menu).to have_personal_area