Add specs scaffold for encrypted token authenticatable

2 files changed, 21 insertions, 1 deletions

diff --git a/app/models/concerns/token_authenticatable_strategies/encrypted.rb b/app/models/concerns/token_authenticatable_strategies/encrypted.rb
index a9ecc10cee6..e2a5a973d4f 100644
--- a/app/models/concerns/token_authenticatable_strategies/encrypted.rb
+++ b/app/models/concerns/token_authenticatable_strategies/encrypted.rb
@@ -20,7 +20,8 @@ module TokenAuthenticatableStrategies
     def get_token(instance)
       raw_token = instance.read_attribute(encrypted_field)
       token = Gitlab::CryptoHelper.aes256_gcm_decrypt(raw_token)
-      token ||= fallback_strategy.get_token(instance) if fallback?
+
+      token || (fallback_strategy.get_token(instance) if fallback?)
     end
 
     def set_token(instance, token)
diff --git a/spec/models/concerns/token_authenticatable_strategies/encrypted_spec.rb b/spec/models/concerns/token_authenticatable_strategies/encrypted_spec.rb
new file mode 100644
index 00000000000..34e5268b34d
--- /dev/null
+++ b/spec/models/concerns/token_authenticatable_strategies/encrypted_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe TokenAuthenticatableStrategies::Encrypted do
+  let(:model) { double(:model) }
+  let(:options) { { fallback: true } }
+
+  subject do
+    described_class.new(model, 'some_field', options)
+  end
+
+  describe '#find_token_authenticatable' do
+  end
+
+  describe '#get_token' do
+  end
+
+  describe '#set_token' do
+  end
+end