Add latest changes from gitlab-org/gitlab@12-10-stable-ee

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/lib/gitlab/application_context_spec.rb b/spec/lib/gitlab/application_context_spec.rb
index 0903ca6f9e8..6674ea059a0 100644
--- a/spec/lib/gitlab/application_context_spec.rb
+++ b/spec/lib/gitlab/application_context_spec.rb
@@ -42,6 +42,18 @@ describe Gitlab::ApplicationContext do
     end
   end
 
+  describe '.current_context_include?' do
+    it 'returns true if the key was present in the context' do
+      described_class.with_context(caller_id: "Hello") do
+        expect(described_class.current_context_include?(:caller_id)).to be(true)
+      end
+    end
+
+    it 'returns false if the key was not present in the current context' do
+      expect(described_class.current_context_include?(:caller_id)).to be(false)
+    end
+  end
+
   describe '#to_lazy_hash' do
     let(:user) { build(:user) }
     let(:project) { build(:project) }