Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

1 files changed, 21 insertions, 0 deletions

diff --git a/spec/config/grape_entity_patch_spec.rb b/spec/config/grape_entity_patch_spec.rb
new file mode 100644
index 00000000000..7334f270ca1
--- /dev/null
+++ b/spec/config/grape_entity_patch_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Grape::Entity patch' do
+  let(:entity_class) { Class.new(Grape::Entity) }
+
+  describe 'NameError in block exposure with argument' do
+    subject(:represent) { entity_class.represent({}, serializable: true) }
+
+    before do
+      entity_class.expose :raise_no_method_error do |_|
+        foo
+      end
+    end
+
+    it 'propagates the error to the caller' do
+      expect { represent }.to raise_error(NameError)
+    end
+  end
+end