From 7114ad8ea2418f8fdc4741c8b7f5b551bcc467a7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 4 Feb 2021 17:42:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- spec/helpers/markup_helper_spec.rb | 15 +++++++++++++++ spec/lib/object_storage/direct_upload_spec.rb | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/helpers/markup_helper_spec.rb b/spec/helpers/markup_helper_spec.rb index 45e8a2e7e1a..3d1690f6588 100644 --- a/spec/helpers/markup_helper_spec.rb +++ b/spec/helpers/markup_helper_spec.rb @@ -355,6 +355,21 @@ RSpec.describe MarkupHelper do expect(doc.css('.gl-label-link')).not_to be_empty end end + + context 'when content has uploads' do + let(:upload_link) { '/uploads/test.png' } + let(:content) { "![ImageTest](#{upload_link})" } + + before do + allow(wiki).to receive(:wiki_base_path).and_return(project.wiki.wiki_base_path) + end + + it 'renders uploads relative to project' do + result = helper.render_wiki_content(wiki) + + expect(result).to include("#{project.full_path}#{upload_link}") + end + end end context 'when file is Asciidoc' do diff --git a/spec/lib/object_storage/direct_upload_spec.rb b/spec/lib/object_storage/direct_upload_spec.rb index bd9d197afa0..547bba5117a 100644 --- a/spec/lib/object_storage/direct_upload_spec.rb +++ b/spec/lib/object_storage/direct_upload_spec.rb @@ -162,10 +162,6 @@ RSpec.describe ObjectStorage::DirectUpload do it 'enables the Workhorse client' do expect(subject[:UseWorkhorseClient]).to be true end - - it 'omits the multipart upload URLs' do - expect(subject).not_to include(:MultipartUpload) - end end context 'when only server side encryption is used' do -- cgit v1.2.3