Merge branch 'hide-role-picker-from-profile-page' into 'master'

Hide role picker from profile page

See merge request gitlab-org/gitlab!19085

app/views/profiles/show.html.haml

@@ -94,7 +94,8 @@
         - else
           = f.text_field :name, label: s_('Profiles|Full name'), required: true, title: s_("Profiles|Using emojis in names seems fun, but please try to set a status message instead"), wrapper: { class: 'col-md-9 qa-full-name rspec-full-name' }, help: s_("Profiles|Enter your name, so people you know can recognize you")
         = f.text_field :id, readonly: true, label: s_('Profiles|User ID'), wrapper: { class: 'col-md-3' }
-      = f.select :role, ::User.roles.keys.map { |role| [role.titleize, role] }, {}, class: 'input-md'
+      - if experiment_enabled?(:signup_flow)
+        = f.select :role, ::User.roles.keys.map { |role| [role.titleize, role] }, { prompt: _('Select your role') }, class: 'input-md'
 
       = render_if_exists 'profiles/email_settings', form: f
       = f.text_field :skype, class: 'input-md', placeholder: s_("Profiles|username")

locale/gitlab.pot

@@ -14813,6 +14813,9 @@ msgstr ""
 msgid "Select user"
 msgstr ""
 
+msgid "Select your role"
+msgstr ""
+
 msgid "Selected levels cannot be used by non-admin users for groups, projects or snippets. If the public level is restricted, user profiles are only visible to logged in users."
 msgstr ""
 

spec/features/profiles/user_edit_profile_spec.rb

@@ -66,6 +66,34 @@ describe 'User edit profile' do
     end
   end
 
+  describe 'when I change my role' do
+    context 'experiment enabled' do
+      before do
+        stub_experiment_for_user(signup_flow: true)
+        visit(profile_path)
+      end
+
+      it 'changes my role' do
+        expect(page).to have_content 'Role'
+        select 'Data Analyst', from: 'user_role'
+        submit_settings
+        user.reload
+        expect(user.role).to eq 'data_analyst'
+      end
+    end
+
+    context 'experiment disabled' do
+      before do
+        stub_experiment_for_user(signup_flow: false)
+        visit(profile_path)
+      end
+
+      it 'does not show the role picker' do
+        expect(page).not_to have_content 'Role'
+      end
+    end
+  end
+
   context 'user avatar' do
     before do
       attach_file(:user_avatar, Rails.root.join('spec', 'fixtures', 'banana_sample.gif'))

spec/views/profiles/show.html.haml_spec.rb

@@ -8,6 +8,7 @@ describe 'profiles/show' do
   before do
     assign(:user, user)
     allow(controller).to receive(:current_user).and_return(user)
+    allow(view).to receive(:experiment_enabled?)
   end
 
   context 'when the profile page is opened' do