1 files changed, 15 insertions, 4 deletions
diff --git a/spec/helpers/jira_connect_helper_spec.rb b/spec/helpers/jira_connect_helper_spec.rb
index 455120f86d5..31aeff85c70 100644
--- a/spec/helpers/jira_connect_helper_spec.rb
+++ b/spec/helpers/jira_connect_helper_spec.rb
@@ -9,7 +9,8 @@ RSpec.describe JiraConnectHelper, feature_category: :integrations do
 
     let(:user) { create(:user) }
     let(:client_id) { '123' }
-    let(:enable_public_keys_storage) { false }
+    let(:enable_public_keys_storage_config) { false }
+    let(:enable_public_keys_storage_setting) { false }
 
     before do
       stub_application_setting(jira_connect_application_key: client_id)
@@ -21,7 +22,9 @@ RSpec.describe JiraConnectHelper, feature_category: :integrations do
       before do
         allow(view).to receive(:current_user).and_return(nil)
         allow(Gitlab.config.gitlab).to receive(:url).and_return('http://test.host')
-        allow(Gitlab.config.jira_connect).to receive(:enable_public_keys_storage).and_return(enable_public_keys_storage)
+        allow(Gitlab.config.jira_connect).to receive(:enable_public_keys_storage)
+          .and_return(enable_public_keys_storage_config)
+        stub_application_setting(jira_connect_public_key_storage_enabled: enable_public_keys_storage_setting)
       end
 
       it 'includes Jira Connect app attributes' do
@@ -105,8 +108,16 @@ RSpec.describe JiraConnectHelper, feature_category: :integrations do
         expect(subject[:public_key_storage_enabled]).to eq(false)
       end
 
-      context 'when public_key_storage is enabled' do
-        let(:enable_public_keys_storage) { true }
+      context 'when public_key_storage is enabled via config' do
+        let(:enable_public_keys_storage_config) { true }
+
+        it 'assignes public_key_storage_enabled to true' do
+          expect(subject[:public_key_storage_enabled]).to eq(true)
+        end
+      end
+
+      context 'when public_key_storage is enabled via setting' do
+        let(:enable_public_keys_storage_setting) { true }
 
         it 'assignes public_key_storage_enabled to true' do
           expect(subject[:public_key_storage_enabled]).to eq(true)