diff options
Diffstat (limited to 'spec/helpers/jira_connect_helper_spec.rb')
-rw-r--r-- | spec/helpers/jira_connect_helper_spec.rb | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/spec/helpers/jira_connect_helper_spec.rb b/spec/helpers/jira_connect_helper_spec.rb index 31aeff85c70..b7c25320a0e 100644 --- a/spec/helpers/jira_connect_helper_spec.rb +++ b/spec/helpers/jira_connect_helper_spec.rb @@ -9,8 +9,7 @@ RSpec.describe JiraConnectHelper, feature_category: :integrations do let(:user) { create(:user) } let(:client_id) { '123' } - let(:enable_public_keys_storage_config) { false } - let(:enable_public_keys_storage_setting) { false } + let(:enable_public_keys_storage) { false } before do stub_application_setting(jira_connect_application_key: client_id) @@ -22,26 +21,18 @@ 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_config) - stub_application_setting(jira_connect_public_key_storage_enabled: enable_public_keys_storage_setting) + stub_application_setting(jira_connect_public_key_storage_enabled: enable_public_keys_storage) end it 'includes Jira Connect app attributes' do is_expected.to include( :groups_path, - :add_subscriptions_path, :subscriptions_path, - :users_path, :subscriptions, :gitlab_user_path ) end - it 'assigns users_path with value' do - expect(subject[:users_path]).to eq(jira_connect_users_path) - end - context 'with oauth_metadata' do let(:oauth_metadata) { helper.jira_connect_app_data([subscription], installation)[:oauth_metadata] } @@ -72,16 +63,6 @@ RSpec.describe JiraConnectHelper, feature_category: :integrations do ) end - context 'jira_connect_oauth feature is disabled' do - before do - stub_feature_flags(jira_connect_oauth: false) - end - - it 'does not assign oauth_metadata' do - expect(oauth_metadata).to be_nil - end - end - context 'with self-managed instance' do let_it_be(:installation) { create(:jira_connect_installation, instance_url: 'https://gitlab.example.com') } @@ -108,16 +89,8 @@ RSpec.describe JiraConnectHelper, feature_category: :integrations do expect(subject[:public_key_storage_enabled]).to eq(false) end - 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 } + context 'when public_key_storage is enabled' do + let(:enable_public_keys_storage) { true } it 'assignes public_key_storage_enabled to true' do expect(subject[:public_key_storage_enabled]).to eq(true) |