Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

2 files changed, 17 insertions, 0 deletions

diff --git a/spec/uploaders/gitlab_uploader_spec.rb b/spec/uploaders/gitlab_uploader_spec.rb
index 4e661e458ad..db70441aaf5 100644
--- a/spec/uploaders/gitlab_uploader_spec.rb
+++ b/spec/uploaders/gitlab_uploader_spec.rb
@@ -160,4 +160,10 @@ RSpec.describe GitlabUploader do
       end
     end
   end
+
+  describe '.version' do
+    subject { uploader_class.version }
+
+    it { expect { subject }.to raise_error(RuntimeError, /not supported/) }
+  end
 end
diff --git a/spec/uploaders/metric_image_uploader_spec.rb b/spec/uploaders/metric_image_uploader_spec.rb
new file mode 100644
index 00000000000..f714724480c
--- /dev/null
+++ b/spec/uploaders/metric_image_uploader_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe MetricImageUploader do
+  describe '.workhorse_local_upload_path' do
+    it 'returns path that includes uploads dir' do
+      expect(described_class.workhorse_local_upload_path).to end_with('/uploads/tmp/uploads')
+    end
+  end
+end