Merge branch '66741-remove-spec-rails_helper-rb' into 'master'

Remove spec/rails_helper.rb

Closes #66741

See merge request gitlab-org/gitlab-ce!32380

.rubocop.yml

@@ -264,8 +264,6 @@ RSpec/EnvAssignment:
   Exclude:
     - 'spec/**/fast_spec_helper.rb'
     - 'ee/spec/**/fast_spec_helper.rb'
-    - 'spec/**/rails_helper.rb'
-    - 'ee/spec/**/rails_helper.rb'
     - 'spec/**/spec_helper.rb'
     - 'ee/spec/**/spec_helper.rb'
 RSpec/BeSuccessMatcher:

bin/rspec-stackprof

@@ -3,7 +3,7 @@
 require 'bundler/setup'
 require 'stackprof'
 $:.unshift 'spec'
-require 'rails_helper'
+require 'spec_helper'
 
 filename = ARGV[0].split('/').last
 interval = ENV.fetch('INTERVAL', 1000).to_i

doc/development/gotchas.md

@@ -18,7 +18,7 @@ end
 Consider the following API spec:
 
 ```ruby
-require 'rails_helper'
+require 'spec_helper'
 
 describe API::Labels do
   it 'creates a first label' do
@@ -69,7 +69,7 @@ is ok, but `create(:label, title: 'label1')` is not.
 Following is the fixed API spec:
 
 ```ruby
-require 'rails_helper'
+require 'spec_helper'
 
 describe API::Labels do
   it 'creates a first label' do

spec/controllers/projects/blob_controller_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe Projects::BlobController do
   include ProjectForksHelper

spec/controllers/sent_notifications_controller_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe SentNotificationsController do
   let(:user) { create(:user) }

spec/features/admin/admin_disables_git_access_protocol_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Admin disables Git access protocol', :js do
   include StubENV

spec/features/admin/admin_disables_two_factor_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Admin disables 2FA for a user' do
   it 'successfully', :js do

spec/features/admin/admin_uses_repository_checks_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Admin uses repository checks' do
   include StubENV

spec/features/boards/add_issues_modal_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue Boards add issue modal', :js do
   let(:project) { create(:project, :public) }

spec/features/boards/boards_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue Boards', :js do
   include DragTo

spec/features/boards/issue_ordering_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue Boards', :js do
   include DragTo

spec/features/boards/keyboard_shortcut_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue Boards shortcut', :js do
   context 'issues are enabled' do

spec/features/boards/modal_filter_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue Boards add issue modal filtering', :js do
   let(:project) { create(:project, :public) }

spec/features/boards/multiple_boards_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Multiple Issue Boards', :js do
   set(:user) { create(:user) }

spec/features/boards/new_issue_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue Boards new issue', :js do
   let(:project) { create(:project, :public) }

spec/features/boards/reload_boards_on_browser_back_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Ensure Boards do not show stale data on browser back', :js do
   let(:project) {create(:project, :public)}

spec/features/boards/sidebar_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue Boards', :js do
   include BoardHelpers

spec/features/boards/sub_group_project_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Sub-group project issue boards', :js do
   let(:group) { create(:group) }

spec/features/commits/user_uses_quick_actions_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Commit > User uses quick actions', :js do
   include Spec::Support::Helpers::Features::NotesHelpers

spec/features/dashboard/todos/target_state_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Dashboard > Todo target states' do
   let(:user)    { create(:user) }

spec/features/groups/board_sidebar_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Group Issue Boards', :js do
   include BoardHelpers

spec/features/groups/board_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Group Boards' do
   let(:group) { create(:group) }

spec/features/groups/milestone_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Group milestones' do
   let(:group) { create(:group) }

spec/features/groups/user_browse_projects_group_page_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'User browse group projects page' do
   let(:user) { create :user }

spec/features/instance_statistics/cohorts_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Cohorts page' do
   before do

spec/features/instance_statistics/instance_statistics_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Cohorts page', :js do
   before do

spec/features/issuables/issuable_list_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'issuable list' do
   let(:project) { create(:project) }

spec/features/issuables/markdown_references/internal_references_spec.rb

 # frozen_string_literal: true
 
-require "rails_helper"
+require 'spec_helper'
 
 describe "Internal references", :js do
   include Spec::Support::Helpers::Features::NotesHelpers

spec/features/issuables/markdown_references/jira_spec.rb

 # frozen_string_literal: true
 
-require "rails_helper"
+require 'spec_helper'
 
 describe "Jira", :js do
   let(:user) { create(:user) }

spec/features/issuables/user_sees_sidebar_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue Sidebar on Mobile' do
   include MobileHelpers

spec/features/issues/bulk_assignment_labels_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issues > Labels bulk assignment' do
   let(:user)      { create(:user) }

spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Resolving all open threads in a merge request from an issue', :js do
   let(:user) { create(:user) }

spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Resolve an open thread in a merge request by creating an issue', :js do
   let(:user) { create(:user) }

spec/features/issues/filtered_search/dropdown_assignee_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Dropdown assignee', :js do
   include FilteredSearchHelpers

spec/features/issues/filtered_search/dropdown_author_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Dropdown author', :js do
   include FilteredSearchHelpers

spec/features/issues/filtered_search/dropdown_emoji_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Dropdown emoji', :js do
   include FilteredSearchHelpers

spec/features/issues/filtered_search/dropdown_hint_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Dropdown hint', :js do
   include FilteredSearchHelpers

spec/features/issues/filtered_search/dropdown_milestone_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Dropdown milestone', :js do
   include FilteredSearchHelpers

spec/features/issues/filtered_search/search_bar_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Search bar', :js do
   include FilteredSearchHelpers

spec/features/issues/filtered_search/visual_tokens_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Visual tokens', :js do
   include FilteredSearchHelpers

spec/features/issues/form_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'New/edit issue', :js do
   include ActionView::Helpers::JavaScriptHelper

spec/features/issues/gfm_autocomplete_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'GFM autocomplete', :js do
   let(:issue_xss_title) { 'This will execute alert<img src=x onerror=alert(2)&lt;img src=x onerror=alert(1)&gt;' }

spec/features/issues/group_label_sidebar_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Group label on issue' do
   it 'renders link to the project issues page' do

spec/features/issues/issue_detail_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue Detail', :js do
   let(:user)     { create(:user) }

spec/features/issues/issue_sidebar_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue Sidebar' do
   include MobileHelpers

spec/features/issues/keyboard_shortcut_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issues shortcut', :js do
   context 'New Issue shortcut' do

spec/features/issues/markdown_toolbar_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Issue markdown toolbar', :js do
   let(:project) { create(:project, :public) }

spec/features/issues/move_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'issue move to another project' do
   let(:user) { create(:user) }

spec/features/issues/resource_label_events_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'List issue resource label events', :js do
   let(:user)     { create(:user) }

spec/features/issues/spam_issues_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'New issue', :js do
   include StubENV

spec/features/issues/todo_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Manually create a todo item from issue', :js do
   let!(:project) { create(:project) }

spec/features/issues/update_issues_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Multiple issue updating from issues#index', :js do
   let!(:project)   { create(:project) }

spec/features/issues/user_creates_branch_and_merge_request_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'User creates branch and merge request on issue page', :js do
   let(:membership_level) { :developer }

spec/features/issues/user_creates_confidential_merge_request_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'User creates confidential merge request on issue page', :js do
   include ProjectForksHelper

spec/features/issues/user_sees_breadcrumb_links_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'New issue breadcrumb' do
   let(:project) { create(:project) }

spec/features/issues/user_uses_quick_actions_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 # These are written as feature specs because they cover more specific test scenarios
 # than the ones described on spec/services/notes/create_service_spec.rb for quick actions,

spec/features/merge_request/user_assigns_themselves_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User assigns themselves' do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_awards_emoji_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User awards emoji', :js do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_creates_mr_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User creates MR' do
   include ProjectForksHelper

spec/features/merge_request/user_customizes_merge_commit_message_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request < User customizes merge commit message', :js do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_locks_discussion_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User locks discussion', :js do
   let(:user) { create(:user) }

spec/features/merge_request/user_merges_immediately_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge requests > User merges immediately', :js do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User merges only if pipeline succeeds', :js do
   let(:merge_request) { create(:merge_request_with_diffs) }

spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User merges when pipeline succeeds', :js do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_posts_diff_notes_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User posts diff notes', :js do
   include MergeRequestDiffHelpers

spec/features/merge_request/user_posts_notes_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User posts notes', :js do
   include NoteInteractionHelpers

spec/features/merge_request/user_resolves_conflicts_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User resolves conflicts', :js do
   let(:project) { create(:project, :repository) }

spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User resolves diff notes and threads', :js do
   let(:project)       { create(:project, :public, :repository) }

spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User scrolls to note on load', :js do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees avatars on diff notes', :js do
   include NoteInteractionHelpers

spec/features/merge_request/user_sees_breadcrumb_links_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'New merge request breadcrumb' do
   let(:project) { create(:project, :repository) }

spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees check out branch modal', :js do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User cherry-picks', :js do
   let(:group) { create(:group) }

spec/features/merge_request/user_sees_closing_issues_message_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees closing issues message', :js do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_sees_deleted_target_branch_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees deleted target branch', :js do
   let(:merge_request) { create(:merge_request) }

spec/features/merge_request/user_sees_deployment_widget_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees deployment widget', :js do
   describe 'when merge request has associated environments' do

spec/features/merge_request/user_sees_diff_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees diff', :js do
   include ProjectForksHelper

spec/features/merge_request/user_sees_discussions_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees threads', :js do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_sees_empty_state_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees empty state' do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees merge button depending on unresolved threads', :js do
   let(:project)        { create(:project, :repository) }

spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees pipelines triggered by merge request', :js do
   include ProjectForksHelper

spec/features/merge_request/user_sees_merge_widget_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees merge widget', :js do
   include ProjectForksHelper

spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request < User sees mini pipeline graph', :js do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees MR from deleted forked project', :js do
   include ProjectForksHelper

spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 # This test serves as a regression test for a bug that caused an error
 # message to be shown by JavaScript when the source branch was deleted.

spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees notes from forked project', :js do
   include ProjectForksHelper

spec/features/merge_request/user_sees_pipelines_from_forked_project_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees pipelines from forked project', :js do
   include ProjectForksHelper

spec/features/merge_request/user_sees_pipelines_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees pipelines', :js do
   describe 'pipeline tab' do

spec/features/merge_request/user_sees_system_notes_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees system notes', :js do
   let(:public_project) { create(:project, :public, :repository) }

spec/features/merge_request/user_sees_versions_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees versions', :js do
   let(:merge_request) do

spec/features/merge_request/user_sees_wip_help_message_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User sees WIP help message' do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User selects branches for new MR', :js do
   let(:project) { create(:project, :public, :repository) }

spec/features/merge_request/user_toggles_whitespace_changes_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User toggles whitespace changes', :js do
   let(:merge_request) { create(:merge_request) }

spec/features/merge_request/user_uses_quick_actions_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 # These are written as feature specs because they cover more specific test scenarios
 # than the ones described on spec/services/notes/create_service_spec.rb for quick actions,

spec/features/merge_requests/filters_generic_behavior_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge Requests > Filters generic behavior', :js do
   include FilteredSearchHelpers

spec/features/merge_requests/user_filters_by_assignees_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge Requests > User filters by assignees', :js do
   include FilteredSearchHelpers

spec/features/merge_requests/user_filters_by_labels_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge Requests > User filters by labels', :js do
   include FilteredSearchHelpers

spec/features/merge_requests/user_filters_by_milestones_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge Requests > User filters by milestones', :js do
   include FilteredSearchHelpers

spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge requests > User filters by multiple criteria', :js do
   include FilteredSearchHelpers

spec/features/merge_requests/user_filters_by_target_branch_spec.rb

 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge Requests > User filters by target branch', :js do
   include FilteredSearchHelpers