Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/requests/jwks_controller_spec.rb b/spec/requests/jwks_controller_spec.rb
index 5eda1979027..6dbb5988f58 100644
--- a/spec/requests/jwks_controller_spec.rb
+++ b/spec/requests/jwks_controller_spec.rb
@@ -3,6 +3,20 @@
 require 'spec_helper'
 
 RSpec.describe JwksController do
+  describe 'Endpoints from the parent Doorkeeper::OpenidConnect::DiscoveryController' do
+    it 'respond successfully' do
+      [
+        "/oauth/discovery/keys",
+        "/.well-known/openid-configuration",
+        "/.well-known/webfinger?resource=#{create(:user).email}"
+      ].each do |endpoint|
+        get endpoint
+
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
+  end
+
   describe 'GET /-/jwks' do
     let(:ci_jwt_signing_key) { OpenSSL::PKey::RSA.generate(1024) }
     let(:ci_jwk) { ci_jwt_signing_key.to_jwk }