From 74ae135888f55c17f6c53bcba9c1ca979a33724e Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Mon, 24 Sep 2018 12:29:22 -0700
Subject: Refactor Feature.flipper method

* Fix typo in context 'when request store is active'
* Rearrange test since the instance variable always gets set now,
even if RequestStore is active
---
 spec/lib/feature_spec.rb | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'spec/lib/feature_spec.rb')

diff --git a/spec/lib/feature_spec.rb b/spec/lib/feature_spec.rb
index 48c0ba8a653..9d56c62ae57 100644
--- a/spec/lib/feature_spec.rb
+++ b/spec/lib/feature_spec.rb
@@ -91,7 +91,11 @@ describe Feature do
   end
 
   describe '.flipper' do
-    shared_examples 'a memoized Flipper instance' do
+    before do
+      described_class.instance_variable_set(:@flipper, nil)
+    end
+
+    context 'when request store is inactive' do
       it 'memoizes the Flipper instance' do
         expect(Flipper).to receive(:new).once.and_call_original
 
@@ -101,16 +105,14 @@ describe Feature do
       end
     end
 
-    context 'when request store is inactive' do
-      before do
+    context 'when request store is active', :request_store do
+      it 'memoizes the Flipper instance' do
+        expect(Flipper).to receive(:new).once.and_call_original
+
+        described_class.flipper
         described_class.instance_variable_set(:@flipper, nil)
+        described_class.flipper
       end
-
-      it_behaves_like 'a memoized Flipper instance'
-    end
-
-    context 'when request store is inactive', :request_store do
-      it_behaves_like 'a memoized Flipper instance'
     end
   end
 
-- 
cgit v1.2.3