Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 20 deletions

diff --git a/spec/lib/atlassian/jira_connect/jwt/asymmetric_spec.rb b/spec/lib/atlassian/jira_connect/jwt/asymmetric_spec.rb
index 86d672067a3..0ffa04e851b 100644
--- a/spec/lib/atlassian/jira_connect/jwt/asymmetric_spec.rb
+++ b/spec/lib/atlassian/jira_connect/jwt/asymmetric_spec.rb
@@ -17,6 +17,7 @@ RSpec.describe Atlassian::JiraConnect::Jwt::Asymmetric do
     let(:jwt) { JWT.encode(jwt_claims, private_key, 'RS256', jwt_headers) }
     let(:public_key) { private_key.public_key }
     let(:stub_asymmetric_jwt_cdn) { 'https://connect-install-keys.atlassian.com' }
+    let(:jira_connect_proxy_url_setting) { nil }
     let(:install_keys_url) { "#{stub_asymmetric_jwt_cdn}/#{public_key_id}" }
     let(:qsh) do
       Atlassian::Jwt.create_query_string_hash('https://gitlab.test/events/installed', 'POST', 'https://gitlab.test')
@@ -25,6 +26,8 @@ RSpec.describe Atlassian::JiraConnect::Jwt::Asymmetric do
     before do
       stub_request(:get, install_keys_url)
         .to_return(body: public_key.to_s, status: 200)
+
+      stub_application_setting(jira_connect_proxy_url: jira_connect_proxy_url_setting)
     end
 
     it 'returns true when verified with public key from CDN' do
@@ -89,10 +92,7 @@ RSpec.describe Atlassian::JiraConnect::Jwt::Asymmetric do
 
     context 'with jira_connect_proxy_url setting' do
       let(:stub_asymmetric_jwt_cdn) { 'https://example.com/-/jira_connect/public_keys' }
-
-      before do
-        stub_application_setting(jira_connect_proxy_url: 'https://example.com')
-      end
+      let(:jira_connect_proxy_url_setting) { 'https://example.com' }
 
       it 'requests the settings CDN' do
         expect(JWT).to receive(:decode).twice.and_call_original
@@ -101,22 +101,6 @@ RSpec.describe Atlassian::JiraConnect::Jwt::Asymmetric do
 
         expect(WebMock).to have_requested(:get, "https://example.com/-/jira_connect/public_keys/#{public_key_id}")
       end
-
-      context 'when jira_connect_oauth_self_managed disabled' do
-        let(:stub_asymmetric_jwt_cdn) { 'https://connect-install-keys.atlassian.com' }
-
-        before do
-          stub_feature_flags(jira_connect_oauth_self_managed: false)
-        end
-
-        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