Add latest changes from gitlab-org/gitlab@13-4-stable-ee

2 files changed, 21 insertions, 0 deletions

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
diff --git a/spec/initializers/remove_active_job_execute_callback_spec.rb b/spec/initializers/remove_active_job_execute_callback_spec.rb
new file mode 100644
index 00000000000..e88b859aa77
--- /dev/null
+++ b/spec/initializers/remove_active_job_execute_callback_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'ActiveJob execute callback' do
+  it 'is removed in test environment' do
+    expect(ActiveJob::Callbacks.singleton_class.__callbacks[:execute].send(:chain).size).to eq(0)
+  end
+end