diff options
Diffstat (limited to 'spec/uploaders/object_storage/cdn_spec.rb')
-rw-r--r-- | spec/uploaders/object_storage/cdn_spec.rb | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/spec/uploaders/object_storage/cdn_spec.rb b/spec/uploaders/object_storage/cdn_spec.rb index 2a447921a19..d6c638297fa 100644 --- a/spec/uploaders/object_storage/cdn_spec.rb +++ b/spec/uploaders/object_storage/cdn_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ObjectStorage::CDN do +RSpec.describe ObjectStorage::CDN, feature_category: :build_artifacts do let(:cdn_options) do { 'object_store' => { @@ -32,6 +32,7 @@ RSpec.describe ObjectStorage::CDN do let(:object) { build_stubbed(:user) } let(:public_ip) { '18.245.0.1' } + let(:query_params) { { foo: :bar } } let_it_be(:project) { build(:project) } @@ -46,9 +47,9 @@ RSpec.describe ObjectStorage::CDN do describe '#cdn_enabled_url' do it 'calls #cdn_signed_url' do expect(subject).not_to receive(:url) - expect(subject).to receive(:cdn_signed_url).and_call_original + expect(subject).to receive(:cdn_signed_url).with(query_params).and_call_original - result = subject.cdn_enabled_url(public_ip) + result = subject.cdn_enabled_url(public_ip, query_params) expect(result.used_cdn).to be true end @@ -76,6 +77,17 @@ RSpec.describe ObjectStorage::CDN do uploader_class.options = Gitlab.config.uploads end + describe '#cdn_enabled_url' do + it 'calls #url' do + expect(subject).not_to receive(:cdn_signed_url) + expect(subject).to receive(:url).with(query: query_params).and_call_original + + result = subject.cdn_enabled_url(public_ip, query_params) + + expect(result.used_cdn).to be false + end + end + describe '#use_cdn?' do it 'returns false' do expect(subject.use_cdn?(public_ip)).to be false |