1 files changed, 23 insertions, 44 deletions
diff --git a/spec/support/shared_examples/features/trial_email_validation_shared_example.rb b/spec/support/shared_examples/features/trial_email_validation_shared_example.rb
index 8304a91af86..81c9ac1164b 100644
--- a/spec/support/shared_examples/features/trial_email_validation_shared_example.rb
+++ b/spec/support/shared_examples/features/trial_email_validation_shared_example.rb
@@ -1,59 +1,38 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples 'user email validation' do
-  let(:email_hint_message) { 'We recommend a work email address.' }
-  let(:email_error_message) { 'Please provide a valid email address.' }
+  let(:email_hint_message) { _('We recommend a work email address.') }
+  let(:email_error_message) { _('Please provide a valid email address.') }
 
   let(:email_warning_message) do
-    'This email address does not look right, are you sure you typed it correctly?'
+    _('This email address does not look right, are you sure you typed it correctly?')
   end
 
-  context 'with trial_email_validation flag enabled' do
-    it 'shows an error message until a correct email is entered' do
-      visit path
-      expect(page).to have_content(email_hint_message)
-      expect(page).not_to have_content(email_error_message)
-      expect(page).not_to have_content(email_warning_message)
+  it 'shows an error message until a correct email is entered' do
+    visit path
+    expect(page).to have_content(email_hint_message)
+    expect(page).not_to have_content(email_error_message)
+    expect(page).not_to have_content(email_warning_message)
 
-      fill_in 'new_user_email', with: 'foo@'
-      fill_in 'new_user_first_name', with: ''
+    fill_in 'new_user_email', with: 'foo@'
+    fill_in 'new_user_first_name', with: ''
 
-      expect(page).not_to have_content(email_hint_message)
-      expect(page).to have_content(email_error_message)
-      expect(page).not_to have_content(email_warning_message)
+    expect(page).not_to have_content(email_hint_message)
+    expect(page).to have_content(email_error_message)
+    expect(page).not_to have_content(email_warning_message)
 
-      fill_in 'new_user_email', with: 'foo@bar'
-      fill_in 'new_user_first_name', with: ''
+    fill_in 'new_user_email', with: 'foo@bar'
+    fill_in 'new_user_first_name', with: ''
 
-      expect(page).not_to have_content(email_hint_message)
-      expect(page).not_to have_content(email_error_message)
-      expect(page).to have_content(email_warning_message)
+    expect(page).not_to have_content(email_hint_message)
+    expect(page).not_to have_content(email_error_message)
+    expect(page).to have_content(email_warning_message)
 
-      fill_in 'new_user_email', with: 'foo@gitlab.com'
-      fill_in 'new_user_first_name', with: ''
+    fill_in 'new_user_email', with: 'foo@gitlab.com'
+    fill_in 'new_user_first_name', with: ''
 
-      expect(page).not_to have_content(email_hint_message)
-      expect(page).not_to have_content(email_error_message)
-      expect(page).not_to have_content(email_warning_message)
-    end
-  end
-
-  context 'when trial_email_validation flag disabled' do
-    before do
-      stub_feature_flags trial_email_validation: false
-    end
-
-    it 'does not show an error message' do
-      visit path
-      expect(page).to have_content(email_hint_message)
-      expect(page).not_to have_content(email_error_message)
-      expect(page).not_to have_content(email_warning_message)
-
-      fill_in 'new_user_email', with: 'foo@'
-
-      expect(page).to have_content(email_hint_message)
-      expect(page).not_to have_content(email_error_message)
-      expect(page).not_to have_content(email_warning_message)
-    end
+    expect(page).not_to have_content(email_hint_message)
+    expect(page).not_to have_content(email_error_message)
+    expect(page).not_to have_content(email_warning_message)
   end
 end