Merge branch 'rs-update-rspec-ee' into 'master'

[EE] Update rspec to 3.7

See merge request gitlab-org/gitlab-ee!6041

Gemfile

@@ -345,7 +345,7 @@ group :development, :test do
 
   gem 'database_cleaner', '~> 1.5.0'
   gem 'factory_bot_rails', '~> 4.8.2'
-  gem 'rspec-rails', '~> 3.6.0'
+  gem 'rspec-rails', '~> 3.7.0'
   gem 'rspec-retry', '~> 0.4.5'
   gem 'rspec_profiling', '~> 0.0.5'
   gem 'rspec-set', '~> 0.1.3'

Gemfile.lock

@@ -771,36 +771,36 @@ GEM
       chunky_png
     rqrcode-rails3 (0.1.7)
       rqrcode (>= 0.4.2)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.7.0)
     rspec-parameterized (0.4.0)
       binding_of_caller
       parser
       proc_to_ast
       rspec (>= 2.13, < 4)
       unparser
-    rspec-rails (3.6.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
     rspec-retry (0.4.5)
       rspec-core
     rspec-set (0.1.3)
-    rspec-support (3.6.0)
+    rspec-support (3.7.1)
     rspec_profiling (0.0.5)
       activerecord
       pg
@@ -1178,7 +1178,7 @@ DEPENDENCIES
   rouge (~> 3.1)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
-  rspec-rails (~> 3.6.0)
+  rspec-rails (~> 3.7.0)
   rspec-retry (~> 0.4.5)
   rspec-set (~> 0.1.3)
   rspec_profiling (~> 0.0.5)

ee/spec/controllers/boards/issues_controller_spec.rb

@@ -22,7 +22,7 @@ describe Boards::IssuesController do
   end
 
   describe 'GET index' do
-    let(:johndoe) { create(:user, avatar: fixture_file_upload(File.join(Rails.root, 'spec/fixtures/dk.png'))) }
+    let(:johndoe) { create(:user, avatar: fixture_file_upload('spec/fixtures/dk.png')) }
 
     context 'with invalid board id' do
       it 'returns a not found 404 response' do

ee/spec/controllers/groups/avatars_controller_spec.rb

@@ -4,7 +4,7 @@ describe Groups::AvatarsController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user)  { create(:user) }
-  let(:group) { create(:group, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) }
+  let(:group) { create(:group, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png')) }
 
   before do
     group.add_owner(user)

ee/spec/lib/gitlab/geo/file_transfer_spec.rb

 require 'spec_helper'
 
 describe Gitlab::Geo::FileTransfer do
-  let(:user) { create(:user, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png')) }
+  let(:user) { create(:user, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png')) }
   let(:upload) { Upload.find_by(model: user, uploader: 'AvatarUploader') }
 
   subject { described_class.new(:file, upload) }

ee/spec/models/geo_node_status_spec.rb

@@ -82,7 +82,7 @@ describe GeoNodeStatus, :geo do
   # can't see changes inside a transaction of a different connection.
   describe '#attachments_synced_count', :delete do
     it 'only counts successful syncs' do
-      create_list(:user, 3, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png'))
+      create_list(:user, 3, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png'))
       uploads = Upload.all.pluck(:id)
 
       create(:geo_file_registry, :avatar, file_id: uploads[0])
@@ -93,7 +93,7 @@ describe GeoNodeStatus, :geo do
     end
 
     it 'does not count synced files that were replaced' do
-      user = create(:user, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png'))
+      user = create(:user, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png'))
 
       expect(subject.attachments_count).to eq(1)
       expect(subject.attachments_synced_count).to eq(0)
@@ -106,7 +106,7 @@ describe GeoNodeStatus, :geo do
       expect(subject.attachments_count).to eq(1)
       expect(subject.attachments_synced_count).to eq(1)
 
-      user.update(avatar: fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg'))
+      user.update(avatar: fixture_file_upload('spec/fixtures/rails_sample.jpg', 'image/jpg'))
 
       subject = described_class.current_node_status
 
@@ -127,7 +127,7 @@ describe GeoNodeStatus, :geo do
   # can't see changes inside a transaction of a different connection.
   describe '#attachments_synced_missing_on_primary_count', :delete do
     it 'only counts successful syncs' do
-      create_list(:user, 3, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png'))
+      create_list(:user, 3, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png'))
       uploads = Upload.all.pluck(:id)
 
       create(:geo_file_registry, :avatar, file_id: uploads[0], missing_on_primary: true)
@@ -154,7 +154,7 @@ describe GeoNodeStatus, :geo do
   end
 
   describe '#attachments_synced_in_percentage', :delete do
-    let(:avatar) { fixture_file_upload(Rails.root.join('spec/fixtures/dk.png')) }
+    let(:avatar) { fixture_file_upload('spec/fixtures/dk.png') }
     let(:upload_1) { create(:upload, model: group, path: avatar) }
     let(:upload_2) { create(:upload, model: project_1, path: avatar) }
 

ee/spec/requests/api/geo_spec.rb

@@ -69,7 +69,7 @@ describe API::Geo do
   end
 
   describe 'GET /geo/transfers/avatar/1' do
-    let(:user) { create(:user, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png')) }
+    let(:user) { create(:user, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png')) }
     let(:upload) { Upload.find_by(model: user, uploader: 'AvatarUploader') }
     let(:transfer) { Gitlab::Geo::FileTransfer.new(:avatar, upload) }
     let(:req_header) { Gitlab::Geo::TransferRequest.new(transfer.request_data).headers }
@@ -115,7 +115,7 @@ describe API::Geo do
 
     before do
       allow_any_instance_of(Gitlab::Geo::TransferRequest).to receive(:requesting_node).and_return(secondary_node)
-      FileUploader.new(project).store!(fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png'))
+      FileUploader.new(project).store!(fixture_file_upload('spec/fixtures/dk.png', 'image/png'))
     end
 
     it 'responds with 401 with invalid auth header' do

ee/spec/requests/api/project_import_spec.rb

@@ -5,7 +5,7 @@ describe API::ProjectImport do
 
   let(:export_path) { "#{Dir.tmpdir}/project_export_spec" }
   let(:user) { create(:user) }
-  let(:file) { File.join(Rails.root, 'spec', 'features', 'projects', 'import_export', 'test_project_export.tar.gz') }
+  let(:file) { File.join('spec', 'features', 'projects', 'import_export', 'test_project_export.tar.gz') }
   let(:namespace) { create(:group) }
   before do
     allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)

ee/spec/services/geo/file_registry_removal_service_spec.rb

@@ -138,7 +138,7 @@ describe Geo::FileRegistryRemovalService do
 
     context 'with namespace_file' do
       set(:group) { create(:group) }
-      let(:file) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png') }
+      let(:file) { fixture_file_upload('spec/fixtures/dk.png', 'image/png') }
       let!(:upload) do
         NamespaceFileUploader.new(group).store!(file)
         Upload.find_by(model: group, uploader: NamespaceFileUploader)
@@ -161,7 +161,7 @@ describe Geo::FileRegistryRemovalService do
 
     context 'with personal_file' do
       let(:snippet) { create(:personal_snippet) }
-      let(:file) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png') }
+      let(:file) { fixture_file_upload('spec/fixtures/dk.png', 'image/png') }
       let!(:upload) do
         PersonalFileUploader.new(snippet).store!(file)
         Upload.find_by(model: snippet, uploader: PersonalFileUploader)

ee/spec/services/geo/file_upload_service_spec.rb

@@ -5,7 +5,7 @@ describe Geo::FileUploadService do
 
   describe '#execute' do
     context 'user avatar' do
-      let(:user) { create(:user, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png')) }
+      let(:user) { create(:user, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png')) }
       let(:upload) { Upload.find_by(model: user, uploader: 'AvatarUploader') }
       let(:params) { { id: upload.id, type: 'avatar' } }
       let(:file_transfer) { Gitlab::Geo::FileTransfer.new(:avatar, upload) }
@@ -29,7 +29,7 @@ describe Geo::FileUploadService do
     end
 
     context 'group avatar' do
-      let(:group) { create(:group, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png')) }
+      let(:group) { create(:group, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png')) }
       let(:upload) { Upload.find_by(model: group, uploader: 'AvatarUploader') }
       let(:params) { { id: upload.id, type: 'avatar' } }
       let(:file_transfer) { Gitlab::Geo::FileTransfer.new(:avatar, upload) }
@@ -53,7 +53,7 @@ describe Geo::FileUploadService do
     end
 
     context 'project avatar' do
-      let(:project) { create(:project, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png')) }
+      let(:project) { create(:project, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png')) }
       let(:upload) { Upload.find_by(model: project, uploader: 'AvatarUploader') }
       let(:params) { { id: upload.id, type: 'avatar' } }
       let(:file_transfer) { Gitlab::Geo::FileTransfer.new(:avatar, upload) }
@@ -107,7 +107,7 @@ describe Geo::FileUploadService do
       let(:file_transfer) { Gitlab::Geo::FileTransfer.new(:file, upload) }
       let(:transfer_request) { Gitlab::Geo::TransferRequest.new(file_transfer.request_data) }
       let(:req_header) { transfer_request.headers['Authorization'] }
-      let(:file) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png') }
+      let(:file) { fixture_file_upload('spec/fixtures/dk.png', 'image/png') }
 
       before do
         FileUploader.new(project).store!(file)
@@ -136,7 +136,7 @@ describe Geo::FileUploadService do
       let(:file_transfer) { Gitlab::Geo::FileTransfer.new(:file, upload) }
       let(:transfer_request) { Gitlab::Geo::TransferRequest.new(file_transfer.request_data) }
       let(:req_header) { transfer_request.headers['Authorization'] }
-      let(:file) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png') }
+      let(:file) { fixture_file_upload('spec/fixtures/dk.png', 'image/png') }
 
       before do
         NamespaceFileUploader.new(group).store!(file)

ee/spec/services/groups/participants_service_spec.rb

 require 'spec_helper'
 
 describe Groups::ParticipantsService do
-  let(:group) { create(:group, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png')) }
+  let(:group) { create(:group, avatar: fixture_file_upload('spec/fixtures/dk.png')) }
   let(:user) { create(:user) }
   let(:epic) { create(:epic, group: group, author: user) }
 

ee/spec/workers/geo/file_download_dispatch_worker_spec.rb

@@ -321,7 +321,7 @@ describe Geo::FileDownloadDispatchWorker, :geo do
       result_object = double(:result, success: true, bytes_downloaded: 100, primary_missing_file: false)
       allow_any_instance_of(::Gitlab::Geo::Transfer).to receive(:download_from_primary).and_return(result_object)
 
-      avatar = fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'))
+      avatar = fixture_file_upload('spec/fixtures/dk.png')
       create_list(:lfs_object, 2, :with_file)
       create_list(:user, 2, avatar: avatar)
       create_list(:note, 2, :with_attachment)
@@ -375,7 +375,7 @@ describe Geo::FileDownloadDispatchWorker, :geo do
       end
 
       it 'does not perform Geo::FileDownloadWorker for upload objects that do not belong to selected namespaces to replicate' do
-        avatar = fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'))
+        avatar = fixture_file_upload('spec/fixtures/dk.png')
         avatar_in_synced_group = create(:upload, model: synced_group, path: avatar)
         create(:upload, model: create(:group), path: avatar)
         avatar_in_project_in_synced_group = create(:upload, model: project_in_synced_group, path: avatar)

spec/controllers/boards/issues_controller_spec.rb

@@ -18,7 +18,7 @@ describe Boards::IssuesController do
   end
 
   describe 'GET index', :request_store do
-    let(:johndoe) { create(:user, avatar: fixture_file_upload(File.join(Rails.root, 'spec/fixtures/dk.png'))) }
+    let(:johndoe) { create(:user, avatar: fixture_file_upload(File.join('spec/fixtures/dk.png'))) }
 
     context 'with invalid board id' do
       it 'returns a not found 404 response' do

spec/controllers/groups/avatars_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Groups::AvatarsController do
   let(:user)  { create(:user) }
-  let(:group) { create(:group, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) }
+  let(:group) { create(:group, avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) }
 
   before do
     group.add_owner(user)

spec/controllers/import/gitlab_projects_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Import::GitlabProjectsController do
   set(:namespace) { create(:namespace) }
   set(:user) { namespace.owner }
-  let(:file) { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
+  let(:file) { fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain') }
 
   before do
     sign_in(user)

spec/controllers/import/google_code_controller_spec.rb

@@ -4,7 +4,7 @@ describe Import::GoogleCodeController do
   include ImportSpecHelper
 
   let(:user) { create(:user) }
-  let(:dump_file) { fixture_file_upload(Rails.root + 'spec/fixtures/GoogleCodeProjectHosting.json', 'application/json') }
+  let(:dump_file) { fixture_file_upload('spec/fixtures/GoogleCodeProjectHosting.json', 'application/json') }
 
   before do
     sign_in(user)

spec/controllers/profiles/avatars_controller_spec.rb

 require 'spec_helper'
 
 describe Profiles::AvatarsController do
-  let(:user)    { create(:user, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png")) }
+  let(:user)    { create(:user, avatar: fixture_file_upload("spec/fixtures/dk.png")) }
 
   before do
     sign_in(user)

spec/controllers/projects/avatars_controller_spec.rb

 require 'spec_helper'
 
 describe Projects::AvatarsController do
-  let(:project) { create(:project, :repository, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) }
+  let(:project) { create(:project, :repository, avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) }
   let(:user)    { create(:user) }
 
   before do

spec/controllers/projects_controller_spec.rb

@@ -6,8 +6,8 @@ describe ProjectsController do
   let(:project) { create(:project) }
   let(:public_project) { create(:project, :public) }
   let(:user) { create(:user) }
-  let(:jpg) { fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg') }
-  let(:txt) { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
+  let(:jpg) { fixture_file_upload('spec/fixtures/rails_sample.jpg', 'image/jpg') }
+  let(:txt) { fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain') }
 
   describe 'GET new' do
     context 'with an authenticated user' do

spec/controllers/uploads_controller_spec.rb

@@ -6,13 +6,13 @@ shared_examples 'content not cached without revalidation' do
 end
 
 describe UploadsController do
-  let!(:user) { create(:user, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) }
+  let!(:user) { create(:user, avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) }
 
   describe 'POST create' do
     let(:model)   { 'personal_snippet' }
     let(:snippet) { create(:personal_snippet, :public) }
-    let(:jpg)     { fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg') }
-    let(:txt)     { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
+    let(:jpg)     { fixture_file_upload('spec/fixtures/rails_sample.jpg', 'image/jpg') }
+    let(:txt)     { fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain') }
 
     context 'when a user does not have permissions to upload a file' do
       it "returns 401 when the user is not logged in" do
@@ -205,7 +205,7 @@ describe UploadsController do
     end
 
     context "when viewing a project avatar" do
-      let!(:project) { create(:project, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) }
+      let!(:project) { create(:project, avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) }
 
       context "when the project is public" do
         before do
@@ -314,7 +314,7 @@ describe UploadsController do
     end
 
     context "when viewing a group avatar" do
-      let!(:group)   { create(:group, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) }
+      let!(:group)   { create(:group, avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) }
 
       context "when the group is public" do
         context "when not signed in" do
@@ -521,7 +521,7 @@ describe UploadsController do
 
     context 'Appearance' do
       context 'when viewing a custom header logo' do
-        let!(:appearance) { create :appearance, header_logo: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'), 'image/png') }
+        let!(:appearance) { create :appearance, header_logo: fixture_file_upload('spec/fixtures/dk.png', 'image/png') }
 
         context 'when not signed in' do
           it 'responds with status 200' do
@@ -541,7 +541,7 @@ describe UploadsController do
       end
 
       context 'when viewing a custom logo' do
-        let!(:appearance) { create :appearance, logo: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'), 'image/png') }
+        let!(:appearance) { create :appearance, logo: fixture_file_upload('spec/fixtures/dk.png', 'image/png') }
 
         context 'when not signed in' do
           it 'responds with status 200' do

spec/factories/lfs_objects.rb

@@ -7,7 +7,7 @@ FactoryBot.define do
   end
 
   trait :with_file do
-    file { fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "`/png") }
+    file { fixture_file_upload("spec/fixtures/dk.png", "`/png") }
   end
 
   # The uniqueness constraint means we can't use the correct OID for all LFS

spec/factories/notes.rb

@@ -130,11 +130,11 @@ FactoryBot.define do
     end
 
     trait :with_attachment do
-      attachment { fixture_file_upload(Rails.root.join( "spec/fixtures/dk.png"), "image/png") }
+      attachment { fixture_file_upload("spec/fixtures/dk.png", "image/png") }
     end
 
     trait :with_svg_attachment do
-      attachment { fixture_file_upload(Rails.root.join("spec/fixtures/unsanitized.svg"), "image/svg+xml") }
+      attachment { fixture_file_upload("spec/fixtures/unsanitized.svg", "image/svg+xml") }
     end
 
     transient do

spec/features/commits_spec.rb

@@ -47,7 +47,7 @@ describe 'Commits' do
 
     context 'commit status is Ci Build' do
       let!(:build) { create(:ci_build, pipeline: pipeline) }
-      let(:artifacts_file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
+      let(:artifacts_file) { fixture_file_upload('spec/fixtures/banana_sample.gif', 'image/gif') }
 
       context 'when logged as developer' do
         before do

spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb

@@ -23,8 +23,8 @@ describe 'Merge request < User sees mini pipeline graph', :js do
   end
 
   context 'as json' do
-    let(:artifacts_file1) { fixture_file_upload(Rails.root.join('spec/fixtures/banana_sample.gif'), 'image/gif') }
-    let(:artifacts_file2) { fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'), 'image/png') }
+    let(:artifacts_file1) { fixture_file_upload(File.join('spec/fixtures/banana_sample.gif'), 'image/gif') }
+    let(:artifacts_file2) { fixture_file_upload(File.join('spec/fixtures/dk.png'), 'image/png') }
 
     before do
       create(:ci_build, :success, :trace_artifact, pipeline: pipeline, legacy_artifacts_file: artifacts_file1)

spec/features/projects/jobs/permissions_spec.rb

@@ -88,8 +88,7 @@ describe 'Project Jobs Permissions' do
   describe 'artifacts page' do
     context 'when recent job has artifacts available' do
       before do
-        artifacts = Rails.root.join('spec/fixtures/ci_build_artifacts.zip')
-        archive = fixture_file_upload(artifacts, 'application/zip')
+        archive = fixture_file_upload('spec/fixtures/ci_build_artifacts.zip')
 
         job.update_attributes(legacy_artifacts_file: archive)
       end

spec/features/projects/jobs_spec.rb

@@ -11,7 +11,7 @@ feature 'Jobs', :clean_gitlab_redis_shared_state do
   let(:job2) { create(:ci_build) }
 
   let(:artifacts_file) do
-    fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif')
+    fixture_file_upload('spec/fixtures/banana_sample.gif', 'image/gif')
   end
 
   before do

spec/features/projects/pages_spec.rb

@@ -314,8 +314,8 @@ feature 'Pages' do
             project: project,
             pipeline: pipeline,
             ref: 'HEAD',
-            legacy_artifacts_file: fixture_file_upload(Rails.root.join('spec/fixtures/pages.zip')),
-            legacy_artifacts_metadata: fixture_file_upload(Rails.root.join('spec/fixtures/pages.zip.meta'))
+            legacy_artifacts_file: fixture_file_upload(File.join('spec/fixtures/pages.zip')),
+            legacy_artifacts_metadata: fixture_file_upload(File.join('spec/fixtures/pages.zip.meta'))
           )
         end
 

spec/helpers/emails_helper_spec.rb

@@ -47,9 +47,7 @@ describe EmailsHelper do
   describe '#header_logo' do
     context 'there is a brand item with a logo' do
       it 'returns the brand header logo' do
-        appearance = create :appearance, header_logo: fixture_file_upload(
-          Rails.root.join('spec/fixtures/dk.png')
-        )
+        appearance = create :appearance, header_logo: fixture_file_upload('spec/fixtures/dk.png')
 
         expect(header_logo).to eq(
           %{<img style="height: 50px" src="/uploads/-/system/appearance/header_logo/#{appearance.id}/dk.png" alt="Dk" />}

spec/helpers/groups_helper_spec.rb

@@ -4,9 +4,9 @@ describe GroupsHelper do
   include ApplicationHelper
 
   describe 'group_icon' do
-    avatar_file_path = File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
-
     it 'returns an url for the avatar' do
+      avatar_file_path = File.join('spec', 'fixtures', 'banana_sample.gif')
+
       group = create(:group)
       group.avatar = fixture_file_upload(avatar_file_path)
       group.save!
@@ -17,9 +17,9 @@ describe GroupsHelper do
   end
 
   describe 'group_icon_url' do
-    avatar_file_path = File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
-
     it 'returns an url for the avatar' do
+      avatar_file_path = File.join('spec', 'fixtures', 'banana_sample.gif')
+
       group = create(:group)
       group.avatar = fixture_file_upload(avatar_file_path)
       group.save!

spec/lib/gitlab/import_export/avatar_saver_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Gitlab::ImportExport::AvatarSaver do
   let(:shared) { project.import_export_shared }
   let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
-  let(:project_with_avatar) { create(:project, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) }
+  let(:project_with_avatar) { create(:project, avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) }
   let(:project) { create(:project) }
 
   before do

spec/lib/gitlab/import_export/uploads_saver_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Gitlab::ImportExport::UploadsSaver do
   describe 'bundle a project Git repo' do
     let(:export_path) { "#{Dir.tmpdir}/uploads_saver_spec" }
-    let(:file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
+    let(:file) { fixture_file_upload('spec/fixtures/banana_sample.gif', 'image/gif') }
     let(:shared) { project.import_export_shared }
 
     before do

spec/models/ci/job_artifact_spec.rb

@@ -76,12 +76,12 @@ describe Ci::JobArtifact do
 
   context 'updating the artifact file' do
     it 'updates the artifact size' do
-      artifact.update!(file: fixture_file_upload(File.join(Rails.root, 'spec/fixtures/dk.png')))
+      artifact.update!(file: fixture_file_upload('spec/fixtures/dk.png'))
       expect(artifact.size).to eq(1062)
     end
 
     it 'updates the project statistics' do
-      expect { artifact.update!(file: fixture_file_upload(File.join(Rails.root, 'spec/fixtures/dk.png'))) }
+      expect { artifact.update!(file: fixture_file_upload('spec/fixtures/dk.png')) }
         .to change { artifact.project.statistics.reload.build_artifacts_size }
         .by(1062 - 106365)
     end

spec/requests/api/project_import_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe API::ProjectImport do
   let(:export_path) { "#{Dir.tmpdir}/project_export_spec" }
   let(:user) { create(:user) }
-  let(:file) { File.join(Rails.root, 'spec', 'features', 'projects', 'import_export', 'test_project_export.tar.gz') }
+  let(:file) { File.join('spec', 'features', 'projects', 'import_export', 'test_project_export.tar.gz') }
   let(:namespace) { create(:group) }
   before do
     allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)

spec/requests/api/projects_spec.rb

@@ -518,7 +518,7 @@ describe API::Projects do
     end
 
     it 'uploads avatar for project a project' do
-      project = attributes_for(:project, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif'))
+      project = attributes_for(:project, avatar: fixture_file_upload('spec/fixtures/banana_sample.gif', 'image/gif'))
 
       post api('/projects', user), project
 
@@ -777,7 +777,7 @@ describe API::Projects do
     end
 
     it "uploads the file and returns its info" do
-      post api("/projects/#{project.id}/uploads", user), file: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")
+      post api("/projects/#{project.id}/uploads", user), file: fixture_file_upload("spec/fixtures/dk.png", "image/png")
 
       expect(response).to have_gitlab_http_status(201)
       expect(json_response['alt']).to eq("dk")

spec/requests/api/runner_spec.rb

@@ -1090,8 +1090,8 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
       let(:jwt_token) { JWT.encode({ 'iss' => 'gitlab-workhorse' }, Gitlab::Workhorse.secret, 'HS256') }
       let(:headers) { { 'GitLab-Workhorse' => '1.0', Gitlab::Workhorse::INTERNAL_API_REQUEST_HEADER => jwt_token } }
       let(:headers_with_token) { headers.merge(API::Helpers::Runner::JOB_TOKEN_HEADER => job.token) }
-      let(:file_upload) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
-      let(:file_upload2) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/gif') }
+      let(:file_upload) { fixture_file_upload('spec/fixtures/banana_sample.gif', 'image/gif') }
+      let(:file_upload2) { fixture_file_upload('spec/fixtures/dk.png', 'image/gif') }
 
       before do
         stub_artifacts_object_storage

spec/requests/api/users_spec.rb

@@ -526,7 +526,7 @@ describe API::Users do
     end
 
     it 'updates user with avatar' do
-      put api("/users/#{user.id}", admin), { avatar: fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
+      put api("/users/#{user.id}", admin), { avatar: fixture_file_upload('spec/fixtures/banana_sample.gif', 'image/gif') }
 
       user.reload
 

spec/requests/openid_connect_spec.rb

@@ -61,7 +61,7 @@ describe 'OpenID Connect requests' do
           email: private_email.email,
           public_email: public_email.email,
           website_url: 'https://example.com',
-          avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png")
+          avatar: fixture_file_upload('spec/fixtures/dk.png')
         )
       end
 

spec/services/projects/fork_service_spec.rb

@@ -8,7 +8,7 @@ describe Projects::ForkService do
       before do
         @from_user = create(:user)
         @from_namespace = @from_user.namespace
-        avatar = fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")
+        avatar = fixture_file_upload("spec/fixtures/dk.png", "image/png")
         @from_project = create(:project,
                                :repository,
                                creator_id: @from_user.id,

spec/services/projects/gitlab_projects_import_service_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Projects::GitlabProjectsImportService do
   set(:namespace) { create(:namespace) }
   let(:path) { 'test-path' }
-  let(:file) { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
+  let(:file) { fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain') }
   let(:overwrite) { false }
   let(:import_params) { { namespace_id: namespace.id, path: path, file: file, overwrite: overwrite } }
   subject { described_class.new(namespace.owner, import_params) }

spec/services/projects/participants_service_spec.rb

@@ -4,7 +4,7 @@ describe Projects::ParticipantsService do
   describe '#groups' do
     describe 'avatar_url' do
       let(:project) { create(:project, :public) }
-      let(:group) { create(:group, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png')) }
+      let(:group) { create(:group, avatar: fixture_file_upload('spec/fixtures/dk.png')) }
       let(:user) { create(:user) }
       let!(:group_member) { create(:group_member, group: group, user: user) }
 

spec/services/projects/update_pages_service_spec.rb

@@ -4,13 +4,13 @@ describe Projects::UpdatePagesService do
   set(:project) { create(:project, :repository) }
   set(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit('HEAD').sha) }
   set(:build) { create(:ci_build, pipeline: pipeline, ref: 'HEAD') }
-  let(:invalid_file) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png') }
+  let(:invalid_file) { fixture_file_upload('spec/fixtures/dk.png') }
   let(:extension) { 'zip' }
 
-  let(:file) { fixture_file_upload(Rails.root + "spec/fixtures/pages.#{extension}") }
-  let(:empty_file) { fixture_file_upload(Rails.root + "spec/fixtures/pages_empty.#{extension}") }
+  let(:file) { fixture_file_upload("spec/fixtures/pages.#{extension}") }
+  let(:empty_file) { fixture_file_upload("spec/fixtures/pages_empty.#{extension}") }
   let(:metadata) do
-    filename = Rails.root + "spec/fixtures/pages.#{extension}.meta"
+    filename = "spec/fixtures/pages.#{extension}.meta"
     fixture_file_upload(filename) if File.exist?(filename)
   end
 
@@ -196,8 +196,8 @@ describe Projects::UpdatePagesService do
     let(:metadata) { spy('metadata') }
 
     before do
-      file = fixture_file_upload(Rails.root + 'spec/fixtures/pages.zip')
-      metafile = fixture_file_upload(Rails.root + 'spec/fixtures/pages.zip.meta')
+      file = fixture_file_upload('spec/fixtures/pages.zip')
+      metafile = fixture_file_upload('spec/fixtures/pages.zip.meta')
 
       build.update_attributes(legacy_artifacts_file: file)
       build.update_attributes(legacy_artifacts_metadata: metafile)

spec/services/upload_service_spec.rb

@@ -9,7 +9,7 @@ describe UploadService do
 
     context 'for valid gif file' do
       before do
-        gif = fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif')
+        gif = fixture_file_upload('spec/fixtures/banana_sample.gif', 'image/gif')
         @link_to_file = upload_file(@project, gif)
       end
 
@@ -21,7 +21,7 @@ describe UploadService do
 
     context 'for valid png file' do
       before do
-        png = fixture_file_upload(Rails.root + 'spec/fixtures/dk.png',
+        png = fixture_file_upload('spec/fixtures/dk.png',
           'image/png')
         @link_to_file = upload_file(@project, png)
       end
@@ -34,7 +34,7 @@ describe UploadService do
 
     context 'for valid jpg file' do
       before do
-        jpg = fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg')
+        jpg = fixture_file_upload('spec/fixtures/rails_sample.jpg', 'image/jpg')
         @link_to_file = upload_file(@project, jpg)
       end
 
@@ -46,7 +46,7 @@ describe UploadService do
 
     context 'for txt file' do
       before do
-        txt = fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain')
+        txt = fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain')
         @link_to_file = upload_file(@project, txt)
       end
 
@@ -58,7 +58,7 @@ describe UploadService do
 
     context 'for too large a file' do
       before do
-        txt = fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain')
+        txt = fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain')
         allow(txt).to receive(:size) { 1000.megabytes.to_i }
         @link_to_file = upload_file(@project, txt)
       end

spec/support/rspec.rb

@@ -9,4 +9,6 @@ RSpec.configure do |config|
   config.include StubConfiguration
   config.include StubObjectStorage
   config.include StubENV
+
+  config.fixture_path = Rails.root if defined?(Rails)
 end

spec/support/shared_examples/controllers/uploads_actions_shared_examples.rb

 shared_examples 'handle uploads' do
   let(:user)  { create(:user) }
-  let(:jpg)   { fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg') }
-  let(:txt)   { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
+  let(:jpg)   { fixture_file_upload('spec/fixtures/rails_sample.jpg', 'image/jpg') }
+  let(:txt)   { fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain') }
   let(:secret) { FileUploader.generate_secret }
   let(:uploader_class) { FileUploader }
 

spec/uploaders/attachment_uploader_spec.rb

@@ -26,7 +26,7 @@ describe AttachmentUploader do
 
   describe "#migrate!" do
     before do
-      uploader.store!(fixture_file_upload(Rails.root.join('spec/fixtures/doc_sample.txt')))
+      uploader.store!(fixture_file_upload(File.join('spec/fixtures/doc_sample.txt')))
       stub_uploads_object_storage
     end
 

spec/uploaders/file_mover_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe FileMover do
   let(:filename) { 'banana_sample.gif' }
-  let(:file) { fixture_file_upload(Rails.root.join('spec', 'fixtures', filename)) }
+  let(:file) { fixture_file_upload(File.join('spec', 'fixtures', filename)) }
   let(:temp_file_path) { File.join('uploads/-/system/temp', 'secret55', filename) }
 
   let(:temp_description) do

spec/uploaders/file_uploader_spec.rb

@@ -89,7 +89,7 @@ describe FileUploader do
 
   describe "#migrate!" do
     before do
-      uploader.store!(fixture_file_upload(Rails.root.join('spec/fixtures/dk.png')))
+      uploader.store!(fixture_file_upload('spec/fixtures/dk.png'))
       stub_uploads_object_storage
     end
 

spec/uploaders/gitlab_uploader_spec.rb

@@ -62,7 +62,7 @@ describe GitlabUploader do
       expect(FileUtils).to receive(:mv).with(anything, /^#{subject.work_dir}/).and_call_original
       expect(FileUtils).to receive(:mv).with(/^#{subject.work_dir}/, /#{subject.cache_dir}/).and_call_original
 
-      fixture = Rails.root.join('spec', 'fixtures', 'rails_sample.jpg')
+      fixture = File.join('spec', 'fixtures', 'rails_sample.jpg')
       subject.cache!(fixture_file_upload(fixture))
 
       expect(subject.file.path).to match(/#{subject.cache_dir}/)

spec/uploaders/job_artifact_uploader_spec.rb

@@ -29,8 +29,7 @@ describe JobArtifactUploader do
     context 'when trace is stored in File storage' do
       context 'when file exists' do
         let(:file) do
-          fixture_file_upload(
-            Rails.root.join('spec/fixtures/trace/sample_trace'), 'text/plain')
+          fixture_file_upload('spec/fixtures/trace/sample_trace', 'text/plain')
         end
 
         before do
@@ -63,8 +62,7 @@ describe JobArtifactUploader do
 
   context 'file is stored in valid local_path' do
     let(:file) do
-      fixture_file_upload(
-        Rails.root.join('spec/fixtures/ci_build_artifacts.zip'), 'application/zip')
+      fixture_file_upload('spec/fixtures/ci_build_artifacts.zip', 'application/zip')
     end
 
     before do
@@ -81,7 +79,7 @@ describe JobArtifactUploader do
 
   describe "#migrate!" do
     before do
-      uploader.store!(fixture_file_upload(Rails.root.join('spec/fixtures/trace/sample_trace')))
+      uploader.store!(fixture_file_upload('spec/fixtures/trace/sample_trace'))
       stub_artifacts_object_storage
     end
 

spec/uploaders/legacy_artifact_uploader_spec.rb

@@ -44,8 +44,7 @@ describe LegacyArtifactUploader do
 
   context 'file is stored in valid path' do
     let(:file) do
-      fixture_file_upload(
-        Rails.root.join('spec/fixtures/ci_build_artifacts.zip'), 'application/zip')
+      fixture_file_upload('spec/fixtures/ci_build_artifacts.zip', 'application/zip')
     end
 
     before do

spec/uploaders/namespace_file_uploader_spec.rb

@@ -28,7 +28,7 @@ describe NamespaceFileUploader do
 
   describe "#migrate!" do
     before do
-      uploader.store!(fixture_file_upload(Rails.root.join('spec/fixtures/doc_sample.txt')))
+      uploader.store!(fixture_file_upload(File.join('spec/fixtures/doc_sample.txt')))
       stub_uploads_object_storage
     end
 

spec/uploaders/object_storage_spec.rb

@@ -583,7 +583,7 @@ describe ObjectStorage do
     context 'when local file is used' do
       context 'when valid file is used' do
         let(:uploaded_file) do
-          fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg')
+          fixture_file_upload('spec/fixtures/rails_sample.jpg', 'image/jpg')
         end
 
         it "properly caches the file" do

spec/uploaders/personal_file_uploader_spec.rb

@@ -45,7 +45,7 @@ describe PersonalFileUploader do
 
   describe "#migrate!" do
     before do
-      uploader.store!(fixture_file_upload(Rails.root.join('spec/fixtures/doc_sample.txt')))
+      uploader.store!(fixture_file_upload('spec/fixtures/doc_sample.txt'))
       stub_uploads_object_storage
     end
 

spec/uploaders/records_uploads_spec.rb

@@ -16,7 +16,7 @@ describe RecordsUploads do
   end
 
   def upload_fixture(filename)
-    fixture_file_upload(Rails.root.join('spec', 'fixtures', filename))
+    fixture_file_upload(File.join('spec', 'fixtures', filename))
   end
 
   describe 'callbacks' do

spec/uploaders/uploader_helper_spec.rb

@@ -12,7 +12,7 @@ describe UploaderHelper do
   end
 
   def upload_fixture(filename)
-    fixture_file_upload(Rails.root.join('spec', 'fixtures', filename))
+    fixture_file_upload(File.join('spec', 'fixtures', filename))
   end
 
   describe '#image_or_video?' do