From adf76f8f1d6da3ecbd8aa5d2da68dc8456283e8f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 4 Sep 2020 15:08:46 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/initializers/carrierwave_patch_spec.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'spec/initializers') diff --git a/spec/initializers/carrierwave_patch_spec.rb b/spec/initializers/carrierwave_patch_spec.rb index d577eca2ac7..c4a7bfa59c6 100644 --- a/spec/initializers/carrierwave_patch_spec.rb +++ b/spec/initializers/carrierwave_patch_spec.rb @@ -28,5 +28,17 @@ RSpec.describe 'CarrierWave::Storage::Fog::File' do expect(subject.authenticated_url).to eq("https://sa.blob.core.windows.net/test_container/test_blob?token") end end + + context 'with custom expire_at' do + it 'properly sets expires param' do + expire_at = 24.hours.from_now + + expect_next_instance_of(Fog::Storage::AzureRM::File) do |file| + expect(file).to receive(:url).with(expire_at).and_call_original + end + + expect(subject.authenticated_url(expire_at: expire_at)).to eq("https://sa.blob.core.windows.net/test_container/test_blob?token") + end + end end end -- cgit v1.2.3