13 files changed, 404 insertions, 103 deletions

diff --git a/spec/controllers/admin/runners_controller_spec.rb b/spec/controllers/admin/runners_controller_spec.rb
index a39a1f38a11..9555caf24db 100644
--- a/spec/controllers/admin/runners_controller_spec.rb
+++ b/spec/controllers/admin/runners_controller_spec.rb
@@ -61,6 +61,51 @@ RSpec.describe Admin::RunnersController, feature_category: :runner_fleet do
     end
   end
 
+  describe '#register' do
+    subject(:register) { get :register, params: { id: new_runner.id } }
+
+    context 'when create_runner_workflow is enabled' do
+      before do
+        stub_feature_flags(create_runner_workflow: true)
+      end
+
+      context 'when runner can be registered after creation' do
+        let_it_be(:new_runner) { create(:ci_runner, registration_type: :authenticated_user) }
+
+        it 'renders a :register template' do
+          register
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to render_template(:register)
+        end
+      end
+
+      context 'when runner cannot be registered after creation' do
+        let_it_be(:new_runner) { runner }
+
+        it 'returns :not_found' do
+          register
+
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+    end
+
+    context 'when create_runner_workflow is disabled' do
+      let_it_be(:new_runner) { create(:ci_runner, registration_type: :authenticated_user) }
+
+      before do
+        stub_feature_flags(create_runner_workflow: false)
+      end
+
+      it 'returns :not_found' do
+        register
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
+
   describe '#edit' do
     render_views
 
diff --git a/spec/controllers/admin/spam_logs_controller_spec.rb b/spec/controllers/admin/spam_logs_controller_spec.rb
index 53eb107a251..b39c3bd009b 100644
--- a/spec/controllers/admin/spam_logs_controller_spec.rb
+++ b/spec/controllers/admin/spam_logs_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Admin::SpamLogsController do
+RSpec.describe Admin::SpamLogsController, feature_category: :instance_resiliency do
   let(:admin) { create(:admin) }
   let(:user) { create(:user) }
   let!(:first_spam) { create(:spam_log, user: user) }
@@ -13,9 +13,10 @@ RSpec.describe Admin::SpamLogsController do
   end
 
   describe '#index' do
-    it 'lists all spam logs' do
+    it 'lists paginated spam logs' do
       get :index
 
+      expect(assigns(:spam_logs)).to be_kind_of(Kaminari::PaginatableWithoutCount)
       expect(response).to have_gitlab_http_status(:ok)
     end
   end
diff --git a/spec/frontend/boards/components/board_form_spec.js b/spec/frontend/boards/components/board_form_spec.js
index f8154145d43..3302fb2ce43 100644
--- a/spec/frontend/boards/components/board_form_spec.js
+++ b/spec/frontend/boards/components/board_form_spec.js
@@ -59,18 +59,14 @@ describe('BoardForm', () => {
     },
   });
 
-  const createComponent = (props, data) => {
+  const createComponent = (props, provide) => {
     wrapper = shallowMountExtended(BoardForm, {
       propsData: { ...defaultProps, ...props },
-      data() {
-        return {
-          ...data,
-        };
-      },
       provide: {
         boardBaseUrl: 'root',
         isGroupBoard: true,
         isProjectBoard: false,
+        ...provide,
       },
       mocks: {
         $apollo: {
@@ -209,6 +205,30 @@ describe('BoardForm', () => {
         expect(setBoardMock).not.toHaveBeenCalled();
         expect(setErrorMock).toHaveBeenCalled();
       });
+
+      describe('when Apollo boards FF is on', () => {
+        it('calls a correct GraphQL mutation and emits addBoard event', async () => {
+          createComponent(
+            { canAdminBoard: true, currentPage: formType.new },
+            { isApolloBoard: true },
+          );
+          fillForm();
+
+          await waitForPromises();
+
+          expect(mutate).toHaveBeenCalledWith({
+            mutation: createBoardMutation,
+            variables: {
+              input: expect.objectContaining({
+                name: 'test',
+              }),
+            },
+          });
+
+          await waitForPromises();
+          expect(wrapper.emitted('addBoard')).toHaveLength(1);
+        });
+      });
     });
   });
 
diff --git a/spec/frontend/notifications/components/custom_notifications_modal_spec.js b/spec/frontend/notifications/components/custom_notifications_modal_spec.js
index 70749557e61..aee681e73c9 100644
--- a/spec/frontend/notifications/components/custom_notifications_modal_spec.js
+++ b/spec/frontend/notifications/components/custom_notifications_modal_spec.js
@@ -2,7 +2,6 @@ import { GlSprintf, GlModal, GlFormGroup, GlFormCheckbox, GlLoadingIcon } from '
 import { shallowMount } from '@vue/test-utils';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import { nextTick } from 'vue';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import { HTTP_STATUS_NOT_FOUND, HTTP_STATUS_OK } from '~/lib/utils/http_status';
@@ -87,24 +86,23 @@ describe('CustomNotificationsModal', () => {
 
     describe('checkbox items', () => {
       beforeEach(async () => {
+        const endpointUrl = '/api/v4/notification_settings';
+
+        mockAxios
+          .onGet(endpointUrl)
+          .reply(HTTP_STATUS_OK, mockNotificationSettingsResponses.default);
+
         wrapper = createComponent();
 
-        // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
-        // eslint-disable-next-line no-restricted-syntax
-        wrapper.setData({
-          events: [
-            { id: 'new_release', enabled: true, name: 'New release', loading: false },
-            { id: 'new_note', enabled: false, name: 'New note', loading: true },
-          ],
-        });
+        wrapper.findComponent(GlModal).vm.$emit('show');
 
-        await nextTick();
+        await waitForPromises();
       });
 
       it.each`
         index | eventId          | eventName        | enabled  | loading
         ${0}  | ${'new_release'} | ${'New release'} | ${true}  | ${false}
-        ${1}  | ${'new_note'}    | ${'New note'}    | ${false} | ${true}
+        ${1}  | ${'new_note'}    | ${'New note'}    | ${false} | ${false}
       `(
         'renders a checkbox for "$eventName" with checked=$enabled',
         async ({ index, eventName, enabled, loading }) => {
@@ -214,16 +212,9 @@ describe('CustomNotificationsModal', () => {
 
           wrapper = createComponent({ injectedProperties });
 
-          // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
-          // eslint-disable-next-line no-restricted-syntax
-          wrapper.setData({
-            events: [
-              { id: 'new_release', enabled: true, name: 'New release', loading: false },
-              { id: 'new_note', enabled: false, name: 'New note', loading: false },
-            ],
-          });
+          wrapper.findComponent(GlModal).vm.$emit('show');
 
-          await nextTick();
+          await waitForPromises();
 
           findCheckboxAt(1).vm.$emit('change', true);
 
@@ -241,19 +232,18 @@ describe('CustomNotificationsModal', () => {
       );
 
       it('shows a toast message when the request fails', async () => {
-        mockAxios.onPut('/api/v4/notification_settings').reply(HTTP_STATUS_NOT_FOUND, {});
+        const endpointUrl = '/api/v4/notification_settings';
+
+        mockAxios
+          .onGet(endpointUrl)
+          .reply(HTTP_STATUS_OK, mockNotificationSettingsResponses.default);
+
+        mockAxios.onPut(endpointUrl).reply(HTTP_STATUS_NOT_FOUND, {});
         wrapper = createComponent();
 
-        // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
-        // eslint-disable-next-line no-restricted-syntax
-        wrapper.setData({
-          events: [
-            { id: 'new_release', enabled: true, name: 'New release', loading: false },
-            { id: 'new_note', enabled: false, name: 'New note', loading: false },
-          ],
-        });
+        wrapper.findComponent(GlModal).vm.$emit('show');
 
-        await nextTick();
+        await waitForPromises();
 
         findCheckboxAt(1).vm.$emit('change', true);
 
diff --git a/spec/frontend/vue_shared/components/file_row_spec.js b/spec/frontend/vue_shared/components/file_row_spec.js
index b70d4565f56..25129ba4cd2 100644
--- a/spec/frontend/vue_shared/components/file_row_spec.js
+++ b/spec/frontend/vue_shared/components/file_row_spec.js
@@ -6,6 +6,9 @@ import FileIcon from '~/vue_shared/components/file_icon.vue';
 import FileRow from '~/vue_shared/components/file_row.vue';
 import FileHeader from '~/vue_shared/components/file_row_header.vue';
 
+const scrollIntoViewMock = jest.fn();
+HTMLElement.prototype.scrollIntoView = scrollIntoViewMock;
+
 describe('File row component', () => {
   let wrapper;
 
@@ -72,11 +75,10 @@ describe('File row component', () => {
       },
       level: 0,
     });
-    jest.spyOn(wrapper.vm, '$emit');
 
     wrapper.element.click();
 
-    expect(wrapper.vm.$emit).toHaveBeenCalledWith('toggleTreeOpen', fileName);
+    expect(wrapper.emitted('toggleTreeOpen')[0][0]).toEqual(fileName);
   });
 
   it('calls scrollIntoView if made active', () => {
@@ -89,14 +91,12 @@ describe('File row component', () => {
       level: 0,
     });
 
-    jest.spyOn(wrapper.vm, 'scrollIntoView');
-
     wrapper.setProps({
       file: { ...wrapper.props('file'), active: true },
     });
 
     return nextTick().then(() => {
-      expect(wrapper.vm.scrollIntoView).toHaveBeenCalled();
+      expect(scrollIntoViewMock).toHaveBeenCalled();
     });
   });
 
diff --git a/spec/graphql/types/ci/runner_type_spec.rb b/spec/graphql/types/ci/runner_type_spec.rb
index a2d107ae295..3195d2cabb8 100644
--- a/spec/graphql/types/ci/runner_type_spec.rb
+++ b/spec/graphql/types/ci/runner_type_spec.rb
@@ -11,9 +11,9 @@ RSpec.describe GitlabSchema.types['CiRunner'], feature_category: :runner do
     expected_fields = %w[
       id description created_at contacted_at maximum_timeout access_level active paused status
       version short_sha revision locked run_untagged ip_address runner_type tag_list
-      project_count job_count admin_url edit_admin_url user_permissions executor_name architecture_name platform_name
-      maintenance_note maintenance_note_html groups projects jobs token_expires_at owner_project job_execution_status
-      ephemeral_authentication_token
+      project_count job_count admin_url edit_admin_url register_admin_url user_permissions executor_name
+      architecture_name platform_name maintenance_note maintenance_note_html groups projects jobs token_expires_at
+      owner_project job_execution_status ephemeral_authentication_token
     ]
 
     expect(described_class).to include_graphql_fields(*expected_fields)
diff --git a/spec/lib/gitlab/ci/config/header/input_spec.rb b/spec/lib/gitlab/ci/config/header/input_spec.rb
new file mode 100644
index 00000000000..f890aa45396
--- /dev/null
+++ b/spec/lib/gitlab/ci/config/header/input_spec.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Ci::Config::Header::Input, feature_category: :pipeline_authoring do
+  let(:factory) do
+    Gitlab::Config::Entry::Factory
+      .new(described_class)
+      .value(input_hash)
+      .with(key: input_name)
+  end
+
+  let(:input_name) { 'foo' }
+
+  subject(:config) { factory.create!.tap(&:compose!) }
+
+  shared_examples 'a valid input' do
+    let(:expected_hash) { input_hash }
+
+    it 'passes validations' do
+      expect(config).to be_valid
+      expect(config.errors).to be_empty
+    end
+
+    it 'returns the value' do
+      expect(config.value).to eq(expected_hash)
+    end
+  end
+
+  shared_examples 'an invalid input' do
+    let(:expected_hash) { input_hash }
+
+    it 'fails validations' do
+      expect(config).not_to be_valid
+      expect(config.errors).to eq(expected_errors)
+    end
+
+    it 'returns the value' do
+      expect(config.value).to eq(expected_hash)
+    end
+  end
+
+  context 'when has a default value' do
+    let(:input_hash) { { default: 'bar' } }
+
+    it_behaves_like 'a valid input'
+  end
+
+  context 'when is a required required input' do
+    let(:input_hash) { nil }
+
+    it_behaves_like 'a valid input'
+  end
+
+  context 'when contains unknown keywords' do
+    let(:input_hash) { { test: 123 } }
+    let(:expected_errors) { ['foo config contains unknown keys: test'] }
+
+    it_behaves_like 'an invalid input'
+  end
+
+  context 'when has invalid name' do
+    let(:input_name) { [123] }
+    let(:input_hash) { {} }
+
+    let(:expected_errors) { ['123 key must be an alphanumeric string'] }
+
+    it_behaves_like 'an invalid input'
+  end
+end
diff --git a/spec/lib/gitlab/ci/config/header/root_spec.rb b/spec/lib/gitlab/ci/config/header/root_spec.rb
new file mode 100644
index 00000000000..b137d0a2aa0
--- /dev/null
+++ b/spec/lib/gitlab/ci/config/header/root_spec.rb
@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Ci::Config::Header::Root, feature_category: :pipeline_authoring do
+  let(:factory) { Gitlab::Config::Entry::Factory.new(described_class).value(header_hash) }
+
+  subject(:config) { factory.create!.tap(&:compose!) }
+
+  shared_examples 'a valid header' do
+    let(:expected_hash) { header_hash }
+
+    it 'passes validations' do
+      expect(config).to be_valid
+      expect(config.errors).to be_empty
+    end
+
+    it 'returns the value' do
+      expect(config.value).to eq(expected_hash)
+    end
+  end
+
+  shared_examples 'an invalid header' do
+    let(:expected_hash) { header_hash }
+
+    it 'fails validations' do
+      expect(config).not_to be_valid
+      expect(config.errors).to eq(expected_errors)
+    end
+
+    it 'returns the value' do
+      expect(config.value).to eq(expected_hash)
+    end
+  end
+
+  context 'when header contains default and required values for inputs' do
+    let(:header_hash) do
+      {
+        spec: {
+          inputs: {
+            test: {},
+            foo: {
+              default: 'bar'
+            }
+          }
+        }
+      }
+    end
+
+    it_behaves_like 'a valid header'
+  end
+
+  context 'when header contains minimal data' do
+    let(:header_hash) do
+      {
+        spec: {
+          inputs: nil
+        }
+      }
+    end
+
+    it_behaves_like 'a valid header' do
+      let(:expected_hash) { { spec: {} } }
+    end
+  end
+
+  context 'when header contains required inputs' do
+    let(:header_hash) do
+      {
+        spec: {
+          inputs: { foo: nil }
+        }
+      }
+    end
+
+    it_behaves_like 'a valid header' do
+      let(:expected_hash) do
+        {
+          spec: {
+            inputs: { foo: {} }
+          }
+        }
+      end
+    end
+  end
+
+  context 'when header contains unknown keywords' do
+    let(:header_hash) { { test: 123 } }
+    let(:expected_errors) { ['root config contains unknown keys: test'] }
+
+    it_behaves_like 'an invalid header'
+  end
+
+  context 'when header input entry has an unknown key' do
+    let(:header_hash) do
+      {
+        spec: {
+          inputs: {
+            foo: {
+              bad: 'value'
+            }
+          }
+        }
+      }
+    end
+
+    let(:expected_errors) { ['spec:inputs:foo config contains unknown keys: bad'] }
+
+    it_behaves_like 'an invalid header'
+  end
+
+  describe '#inputs_value' do
+    let(:header_hash) do
+      {
+        spec: {
+          inputs: {
+            foo: nil,
+            bar: {
+              default: 'baz'
+            }
+          }
+        }
+      }
+    end
+
+    it 'returns the inputs' do
+      expect(config.inputs_value).to eq({
+        foo: {},
+        bar: { default: 'baz' }
+      })
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/config/header/spec_spec.rb b/spec/lib/gitlab/ci/config/header/spec_spec.rb
new file mode 100644
index 00000000000..4e8aceb5465
--- /dev/null
+++ b/spec/lib/gitlab/ci/config/header/spec_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Ci::Config::Header::Spec, feature_category: :pipeline_authoring do
+  let(:factory) { Gitlab::Config::Entry::Factory.new(described_class).value(spec_hash) }
+
+  subject(:config) { factory.create!.tap(&:compose!) }
+
+  context 'when spec contains default values for inputs' do
+    let(:spec_hash) do
+      {
+        inputs: {
+          foo: {
+            default: 'bar'
+          }
+        }
+      }
+    end
+
+    it 'passes validations' do
+      expect(config).to be_valid
+      expect(config.errors).to be_empty
+    end
+
+    it 'returns the value' do
+      expect(config.value).to eq(spec_hash)
+    end
+  end
+
+  context 'when spec contains unknown keywords' do
+    let(:spec_hash) { { test: 123 } }
+    let(:expected_errors) { ['spec config contains unknown keys: test'] }
+
+    it 'fails validations' do
+      expect(config).not_to be_valid
+      expect(config.errors).to eq(expected_errors)
+    end
+
+    it 'returns the value' do
+      expect(config.value).to eq(spec_hash)
+    end
+  end
+end
diff --git a/spec/models/concerns/uniquify_spec.rb b/spec/lib/gitlab/utils/uniquify_spec.rb
index 9b79e4d4154..df02fbe8c82 100644
--- a/spec/models/concerns/uniquify_spec.rb
+++ b/spec/lib/gitlab/utils/uniquify_spec.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 
-RSpec.describe Uniquify do
-  let(:uniquify) { described_class.new }
+RSpec.describe Gitlab::Utils::Uniquify, feature_category: :shared do
+  subject(:uniquify) { described_class.new }
 
   describe "#string" do
     it 'returns the given string if it does not exist' do
-      result = uniquify.string('test_string') { |s| false }
+      result = uniquify.string('test_string') { |_s| false }
 
       expect(result).to eq('test_string')
     end
@@ -34,7 +34,7 @@ RSpec.describe Uniquify do
     end
 
     it 'allows passing in a base function that defines the location of the counter' do
-      result = uniquify.string(-> (counter) { "test_#{counter}_string" }) do |s|
+      result = uniquify.string(->(counter) { "test_#{counter}_string" }) do |s|
         s == 'test__string'
       end
 
diff --git a/spec/requests/api/graphql/ci/runner_spec.rb b/spec/requests/api/graphql/ci/runner_spec.rb
index 986e3ce9e52..7c970c2b548 100644
--- a/spec/requests/api/graphql/ci/runner_spec.rb
+++ b/spec/requests/api/graphql/ci/runner_spec.rb
@@ -107,6 +107,8 @@ RSpec.describe 'Query.runner(id)', feature_category: :runner_fleet do
         ),
         project_count: nil,
         admin_url: "http://localhost/admin/runners/#{runner.id}",
+        edit_admin_url: "http://localhost/admin/runners/#{runner.id}/edit",
+        register_admin_url: runner.registration_available? ? "http://localhost/admin/runners/#{runner.id}/register" : nil,
         user_permissions: {
           'readRunner' => true,
           'updateRunner' => true,
@@ -135,7 +137,7 @@ RSpec.describe 'Query.runner(id)', feature_category: :runner_fleet do
       runner_data = graphql_data_at(:runner)
       expect(runner_data).not_to be_nil
 
-      expect(runner_data).to match a_graphql_entity_for(runner, admin_url: nil)
+      expect(runner_data).to match a_graphql_entity_for(runner, admin_url: nil, edit_admin_url: nil)
       expect(runner_data['tagList']).to match_array runner.tag_list
     end
   end
@@ -307,6 +309,24 @@ RSpec.describe 'Query.runner(id)', feature_category: :runner_fleet do
     it_behaves_like 'runner details fetch'
   end
 
+  describe 'for registration type' do
+    context 'when registered with registration token' do
+      let(:runner) do
+        create(:ci_runner, registration_type: :registration_token)
+      end
+
+      it_behaves_like 'runner details fetch'
+    end
+
+    context 'when registered with authenticated user' do
+      let(:runner) do
+        create(:ci_runner, registration_type: :authenticated_user)
+      end
+
+      it_behaves_like 'runner details fetch'
+    end
+  end
+
   describe 'for group runner request' do
     let(:query) do
       %(
@@ -568,14 +588,14 @@ RSpec.describe 'Query.runner(id)', feature_category: :runner_fleet do
       end
     end
 
-    context 'with request made by creator' do
+    context 'with request made by creator', :frozen_time do
       let(:user) { creator }
 
       context 'with runner created in UI' do
         let(:registration_type) { :authenticated_user }
 
-        context 'with runner created in last 3 hours' do
-          let(:created_at) { (3.hours - 1.second).ago }
+        context 'with runner created in last hour' do
+          let(:created_at) { (Ci::Runner::REGISTRATION_AVAILABILITY_TIME - 1.second).ago }
 
           context 'with no runner machine registed yet' do
             it_behaves_like 'an ephemeral_authentication_token'
@@ -589,13 +609,13 @@ RSpec.describe 'Query.runner(id)', feature_category: :runner_fleet do
         end
 
         context 'with runner created almost too long ago' do
-          let(:created_at) { (3.hours - 1.second).ago }
+          let(:created_at) { (Ci::Runner::REGISTRATION_AVAILABILITY_TIME - 1.second).ago }
 
           it_behaves_like 'an ephemeral_authentication_token'
         end
 
         context 'with runner created too long ago' do
-          let(:created_at) { 3.hours.ago }
+          let(:created_at) { Ci::Runner::REGISTRATION_AVAILABILITY_TIME.ago }
 
           it_behaves_like 'a protected ephemeral_authentication_token'
         end
@@ -604,8 +624,8 @@ RSpec.describe 'Query.runner(id)', feature_category: :runner_fleet do
       context 'with runner registered from command line' do
         let(:registration_type) { :registration_token }
 
-        context 'with runner created in last 3 hours' do
-          let(:created_at) { (3.hours - 1.second).ago }
+        context 'with runner created in last 1 hour' do
+          let(:created_at) { (Ci::Runner::REGISTRATION_AVAILABILITY_TIME - 1.second).ago }
 
           it_behaves_like 'a protected ephemeral_authentication_token'
         end
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index 7aa7d8e8abd..d6c310d25f2 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -7956,7 +7956,6 @@
 - './spec/models/concerns/token_authenticatable_strategies/encryption_helper_spec.rb'
 - './spec/models/concerns/transactions_spec.rb'
 - './spec/models/concerns/triggerable_hooks_spec.rb'
-- './spec/models/concerns/uniquify_spec.rb'
 - './spec/models/concerns/usage_statistics_spec.rb'
 - './spec/models/concerns/vulnerability_finding_helpers_spec.rb'
 - './spec/models/concerns/vulnerability_finding_signature_helpers_spec.rb'
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..5bab1e76e12 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
@@ -8,52 +8,31 @@ RSpec.shared_examples 'user email validation' do
     '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)
-
-      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)
-
-      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)
-
-      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
+  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: ''
+
+    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)
 
-  context 'when trial_email_validation flag disabled' do
-    before do
-      stub_feature_flags trial_email_validation: false
-    end
+    fill_in 'new_user_email', with: 'foo@bar'
+    fill_in 'new_user_first_name', with: ''
 
-    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)
+    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@'
+    fill_in 'new_user_email', with: 'foo@gitlab.com'
+    fill_in 'new_user_first_name', with: ''
 
-      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