From bbaf76d24f2e36bf5c372637301e52ec01452b24 Mon Sep 17 00:00:00 2001
From: xfyuan <xfyuan@gitlab.cn>
Date: Thu, 12 Dec 2024 09:23:02 +0000
Subject: [PATCH] Fix pre-main-jh pipeline 2024-12-12
---
jh/spec/features/registrations/combined_registration_spec.rb | 1 +
jh/spec/features/registrations/saas/invite_flow_spec.rb | 2 +-
.../saas/standard_flow_just_me_creating_project_spec.rb | 4 ++--
...with_trial_from_external_site_without_confirmation_spec.rb | 2 +-
...tart_trial_from_external_site_without_confirmation_spec.rb | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/jh/spec/features/registrations/combined_registration_spec.rb b/jh/spec/features/registrations/combined_registration_spec.rb
index a5953dd9245c..d58c376485c6 100644
--- a/jh/spec/features/registrations/combined_registration_spec.rb
+++ b/jh/spec/features/registrations/combined_registration_spec.rb
@@ -18,6 +18,7 @@
expect(page).to have_content('Welcome to GitLab') # rubocop:disable RSpec/ExpectInHook -- need verify content
+ select 'Software Developer', from: 'user_onboarding_status_role'
choose 'Just me'
choose 'Create a new project'
click_on 'Continue'
diff --git a/jh/spec/features/registrations/saas/invite_flow_spec.rb b/jh/spec/features/registrations/saas/invite_flow_spec.rb
index 15f36f50cfea..1933693a0bbc 100644
--- a/jh/spec/features/registrations/saas/invite_flow_spec.rb
+++ b/jh/spec/features/registrations/saas/invite_flow_spec.rb
@@ -62,7 +62,7 @@ def registers_from_invite(user:, group:)
end
def fill_in_welcome_form
- select 'Software Developer', from: 'user_role'
+ select 'Software Developer', from: 'user_onboarding_status_role'
select 'A different reason', from: 'user_registration_objective'
fill_in 'Why are you signing up? (optional)', with: 'My reason'
end
diff --git a/jh/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb b/jh/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb
index a59a11562005..c84a9573a86c 100644
--- a/jh/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb
+++ b/jh/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb
@@ -31,7 +31,7 @@
end
def fills_in_welcome_form
- select 'Software Developer', from: 'user_role'
+ select 'Software Developer', from: 'user_onboarding_status_role'
select 'A different reason', from: 'user_registration_objective'
fill_in 'Why are you signing up? (optional)', with: 'My reason'
@@ -44,7 +44,7 @@ def expect_to_see_welcome_form
page.within(welcome_form_selector) do
expect(page).to have_content('Role')
- expect(page).to have_field('user_role', valid: false)
+ expect(page).to have_field('user_onboarding_status_role', valid: false)
expect(page).to have_field('user_setup_for_company_true', valid: false)
expect(page).to have_content('I\'m signing up for GitLab because:')
expect(page).to have_content('Who will be using GitLab?')
diff --git a/jh/spec/features/registrations/sign_up_with_trial_from_external_site_without_confirmation_spec.rb b/jh/spec/features/registrations/sign_up_with_trial_from_external_site_without_confirmation_spec.rb
index 12f9c59a9555..5c0dfbf8d88e 100644
--- a/jh/spec/features/registrations/sign_up_with_trial_from_external_site_without_confirmation_spec.rb
+++ b/jh/spec/features/registrations/sign_up_with_trial_from_external_site_without_confirmation_spec.rb
@@ -32,7 +32,7 @@
fill_in_sign_up_form(user)
- select 'Software Developer', from: 'user_role'
+ select 'Software Developer', from: 'user_onboarding_status_role'
choose 'My company or team'
choose 'Create a new project'
click_button 'Continue'
diff --git a/jh/spec/features/registrations/start_trial_from_external_site_without_confirmation_spec.rb b/jh/spec/features/registrations/start_trial_from_external_site_without_confirmation_spec.rb
index 80356ac42594..94e84b3aa188 100644
--- a/jh/spec/features/registrations/start_trial_from_external_site_without_confirmation_spec.rb
+++ b/jh/spec/features/registrations/start_trial_from_external_site_without_confirmation_spec.rb
@@ -28,7 +28,7 @@
fill_in_sign_up_form(user)
- select 'Software Developer', from: 'user_role'
+ select 'Software Developer', from: 'user_onboarding_status_role'
choose 'My company or team'
click_button 'Continue'
--
GitLab