Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 14 insertions, 1 deletions

diff --git a/spec/lib/atlassian/jira_connect/jwt/asymmetric_spec.rb b/spec/lib/atlassian/jira_connect/jwt/asymmetric_spec.rb
index 89c85489aea..c14193660e9 100644
--- a/spec/lib/atlassian/jira_connect/jwt/asymmetric_spec.rb
+++ b/spec/lib/atlassian/jira_connect/jwt/asymmetric_spec.rb
@@ -90,7 +90,7 @@ RSpec.describe Atlassian::JiraConnect::Jwt::Asymmetric, feature_category: :integ
       it { is_expected.not_to be_valid }
     end
 
-    context 'with jira_connect_proxy_url setting' do
+    context 'with jira_connect_proxy_url setting', :aggregate_failures do
       let(:stub_asymmetric_jwt_cdn) { 'https://example.com/-/jira_connect/public_keys' }
       let(:jira_connect_proxy_url_setting) { 'https://example.com' }
 
@@ -101,6 +101,19 @@ RSpec.describe Atlassian::JiraConnect::Jwt::Asymmetric, feature_category: :integ
 
         expect(WebMock).to have_requested(:get, "https://example.com/-/jira_connect/public_keys/#{public_key_id}")
       end
+
+      context 'when the setting is an empty string', :aggregate_failures do
+        let(:jira_connect_proxy_url_setting) { '' }
+        let(:stub_asymmetric_jwt_cdn) { 'https://connect-install-keys.atlassian.com' }
+
+        it 'requests the default CDN' do
+          expect(JWT).to receive(:decode).twice.and_call_original
+
+          expect(asymmetric_jwt).to be_valid
+
+          expect(WebMock).to have_requested(:get, install_keys_url)
+        end
+      end
     end
   end