Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 29 insertions, 0 deletions

diff --git a/spec/lib/gitlab/cache_spec.rb b/spec/lib/gitlab/cache_spec.rb
new file mode 100644
index 00000000000..5b1034a77a3
--- /dev/null
+++ b/spec/lib/gitlab/cache_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Gitlab::Cache, :request_store do
+  describe "#fetch_once" do
+    subject do
+      proc do
+        described_class.fetch_once([:test, "key"], expires_in: 10.minutes) do
+          "return value"
+        end
+      end
+    end
+
+    it "fetches from the cache once" do
+      expect(Rails.cache).to receive(:fetch).once.with([:test, "key"], expires_in: 10.minutes).and_call_original
+
+      expect(subject.call).to eq("return value")
+      expect(subject.call).to eq("return value")
+    end
+
+    it "always returns from the request store" do
+      expect(Gitlab::SafeRequestStore).to receive(:fetch).twice.with([:test, "key"]).and_call_original
+
+      expect(subject.call).to eq("return value")
+      expect(subject.call).to eq("return value")
+    end
+  end
+end