Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 0 deletions

diff --git a/spec/controllers/concerns/send_file_upload_spec.rb b/spec/controllers/concerns/send_file_upload_spec.rb
index 9adec42842c..747ccd7ba1b 100644
--- a/spec/controllers/concerns/send_file_upload_spec.rb
+++ b/spec/controllers/concerns/send_file_upload_spec.rb
@@ -79,6 +79,23 @@ RSpec.describe SendFileUpload do
         it_behaves_like 'handles image resize requests allowed by FFs'
       end
 
+      context 'when boths FFs are enabled globally' do
+        before do
+          stub_feature_flags(dynamic_image_resizing_requester: true)
+          stub_feature_flags(dynamic_image_resizing_owner: true)
+        end
+
+        it_behaves_like 'handles image resize requests allowed by FFs'
+
+        context 'when current_user is nil' do
+          before do
+            allow(controller).to receive(:current_user).and_return(nil)
+          end
+
+          it_behaves_like 'handles image resize requests allowed by FFs'
+        end
+      end
+
       context 'when only FF based on content requester is enabled for current user' do
         before do
           stub_feature_flags(dynamic_image_resizing_requester: image_requester)