Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/initializers/circuitbox_spec.rb b/spec/initializers/circuitbox_spec.rb
new file mode 100644
index 00000000000..64e384e4d22
--- /dev/null
+++ b/spec/initializers/circuitbox_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'circuitbox', feature_category: :shared do
+  it 'does not configure Circuitbox', unless: Gitlab.ee? do
+    expect(Circuitbox.default_circuit_store).to be_a(Circuitbox::MemoryStore)
+    expect(Circuitbox.default_notifier).to be_a(Circuitbox::Notifier::ActiveSupport)
+  end
+
+  it 'configures Circuitbox', if: Gitlab.ee? do
+    expect(Circuitbox.default_circuit_store).to be_a(Gitlab::CircuitBreaker::Store)
+    expect(Circuitbox.default_notifier).to be_a(Gitlab::CircuitBreaker::Notifier)
+  end
+end