Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'

Resolve "Uploads specs are failing on master"

Closes #47684

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

4 files changed, 4 insertions, 4 deletions

diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 3230d7b438f..1df2c954893 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -562,7 +562,7 @@ describe UploadsController do
     end
 
     context 'original filename or a version filename must match' do
-      let!(:appearance) { create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'), 'image/png') }
+      let!(:appearance) { create :appearance, favicon: fixture_file_upload('spec/fixtures/dk.png', 'image/png') }
 
       context 'has a valid filename on the original file' do
         it 'successfully returns the file' do
diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb
index fdc5c0180e4..08c4a474217 100644
--- a/spec/lib/gitlab/favicon_spec.rb
+++ b/spec/lib/gitlab/favicon_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe Gitlab::Favicon, :request_store do
     end
 
     it 'uses the custom favicon if a favicon appearance is present' do
-      create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'))
+      create :appearance, favicon: fixture_file_upload('spec/fixtures/dk.png')
       expect(described_class.main).to match %r{/uploads/-/system/appearance/favicon/\d+/favicon_main_dk.png}
     end
   end
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index c3b4eb17a5c..b9f1c7dd5df 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.rb
@@ -475,7 +475,7 @@ describe JiraService do
     end
 
     it 'includes returns the custom favicon' do
-      create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'))
+      create :appearance, favicon: fixture_file_upload('spec/fixtures/dk.png')
 
       props = described_class.new.send(:build_remote_link_props, url: 'http://example.com', title: 'title')
       expect(props[:object][:icon][:url16x16]).to match %r{^http://localhost/uploads/-/system/appearance/favicon/\d+/favicon_main_dk.png$}
diff --git a/spec/uploaders/favicon_uploader_spec.rb b/spec/uploaders/favicon_uploader_spec.rb
index db8a3207f4d..37deea8ab90 100644
--- a/spec/uploaders/favicon_uploader_spec.rb
+++ b/spec/uploaders/favicon_uploader_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe FaviconUploader do
   end
 
   def upload_fixture(filename)
-    fixture_file_upload(Rails.root.join('spec', 'fixtures', filename))
+    fixture_file_upload("spec/fixtures/#{filename}")
   end
 
   context 'versions' do