Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 1 insertions, 21 deletions

diff --git a/spec/controllers/registrations/welcome_controller_spec.rb b/spec/controllers/registrations/welcome_controller_spec.rb
index 6d34b56df09..034c9b3d1c0 100644
--- a/spec/controllers/registrations/welcome_controller_spec.rb
+++ b/spec/controllers/registrations/welcome_controller_spec.rb
@@ -60,10 +60,8 @@ RSpec.describe Registrations::WelcomeController do
   end
 
   describe '#update' do
-    let(:email_opted_in) { '0' }
-
     subject(:update) do
-      patch :update, params: { user: { role: 'software_developer', setup_for_company: 'false', email_opted_in: email_opted_in } }
+      patch :update, params: { user: { role: 'software_developer', setup_for_company: 'false' } }
     end
 
     context 'without a signed in user' do
@@ -100,24 +98,6 @@ RSpec.describe Registrations::WelcomeController do
           end
         end
       end
-
-      context 'when the user opted in' do
-        let(:email_opted_in) { '1' }
-
-        it 'sets the email_opted_in field' do
-          subject
-
-          expect(controller.current_user.email_opted_in).to eq(true)
-        end
-      end
-
-      context 'when the user opted out' do
-        it 'sets the email_opted_in field' do
-          subject
-
-          expect(controller.current_user.email_opted_in).to eq(false)
-        end
-      end
     end
   end
 end