Merge branch 'fj-230610-avoid-redirection-if-snippets-vue-edit-ff-enabled' into 'master'

Avoid snippet redirection if snippets_binary_blob enabled

See merge request gitlab-org/gitlab!37406

app/controllers/concerns/snippets_actions.rb

@@ -132,6 +132,8 @@ module SnippetsActions
   end
 
   def redirect_if_binary
+    return if Feature.enabled?(:snippets_binary_blob)
+
     redirect_to gitlab_snippet_path(snippet) if blob&.binary?
   end
 end

spec/support/shared_examples/controllers/binary_blob_shared_examples.rb

 # frozen_string_literal: true
 
 RSpec.shared_examples 'editing snippet checks blob is binary' do
+  let(:snippets_binary_blob_value) { true }
+
   before do
     sign_in(user)
 
@@ -8,6 +10,8 @@ RSpec.shared_examples 'editing snippet checks blob is binary' do
       allow(blob).to receive(:binary?).and_return(binary)
     end
 
+    stub_feature_flags(snippets_binary_blob: snippets_binary_blob_value)
+
     subject
   end
 
@@ -23,13 +27,24 @@ RSpec.shared_examples 'editing snippet checks blob is binary' do
   context 'when blob is binary' do
     let(:binary) { true }
 
-    it 'redirects away' do
-      expect(response).to redirect_to(gitlab_snippet_path(snippet))
+    it 'responds with status 200' do
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(response).to render_template(:edit)
+    end
+
+    context 'when feature flag :snippets_binary_blob is disabled' do
+      let(:snippets_binary_blob_value) { false }
+
+      it 'redirects away' do
+        expect(response).to redirect_to(gitlab_snippet_path(snippet))
+      end
     end
   end
 end
 
 RSpec.shared_examples 'updating snippet checks blob is binary' do
+  let(:snippets_binary_blob_value) { true }
+
   before do
     sign_in(user)
 
@@ -37,6 +52,8 @@ RSpec.shared_examples 'updating snippet checks blob is binary' do
       allow(blob).to receive(:binary?).and_return(binary)
     end
 
+    stub_feature_flags(snippets_binary_blob: snippets_binary_blob_value)
+
     subject
   end
 
@@ -52,9 +69,18 @@ RSpec.shared_examples 'updating snippet checks blob is binary' do
   context 'when blob is binary' do
     let(:binary) { true }
 
-    it 'redirects away without updating' do
+    it 'updates successfully' do
+      expect(snippet.reload.title).to eq title
       expect(response).to redirect_to(gitlab_snippet_path(snippet))
-      expect(snippet.reload.title).not_to eq title
+    end
+
+    context 'when feature flag :snippets_binary_blob is disabled' do
+      let(:snippets_binary_blob_value) { false }
+
+      it 'redirects away without updating' do
+        expect(response).to redirect_to(gitlab_snippet_path(snippet))
+        expect(snippet.reload.title).not_to eq title
+      end
     end
   end
 end