diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-22 15:08:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-22 15:08:41 +0300 |
commit | edd183a633915eacd9b73cab43ea839a4cd42bf6 (patch) | |
tree | e950000a90a3ebf05d135b5add8e569fafffbd38 /spec/routing | |
parent | 9dab4d7b6492628eb9222f14954fdd8889bd6e34 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/routing')
-rw-r--r-- | spec/routing/openid_connect_spec.rb | 5 | ||||
-rw-r--r-- | spec/routing/routing_spec.rb | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/spec/routing/openid_connect_spec.rb b/spec/routing/openid_connect_spec.rb index b5291953730..dc9190114fd 100644 --- a/spec/routing/openid_connect_spec.rb +++ b/spec/routing/openid_connect_spec.rb @@ -3,7 +3,6 @@ require 'spec_helper' # oauth_discovery_keys GET /oauth/discovery/keys(.:format) doorkeeper/openid_connect/discovery#keys -# jwks GET /-/jwks(.:format) doorkeeper/openid_connect/discovery#keys # oauth_discovery_provider GET /.well-known/openid-configuration(.:format) doorkeeper/openid_connect/discovery#provider # oauth_discovery_webfinger GET /.well-known/webfinger(.:format) doorkeeper/openid_connect/discovery#webfinger RSpec.describe Doorkeeper::OpenidConnect::DiscoveryController, 'routing' do @@ -18,10 +17,6 @@ RSpec.describe Doorkeeper::OpenidConnect::DiscoveryController, 'routing' do it "to #keys" do expect(get('/oauth/discovery/keys')).to route_to('doorkeeper/openid_connect/discovery#keys') end - - it "/-/jwks" do - expect(get('/-/jwks')).to route_to('doorkeeper/openid_connect/discovery#keys') - end end # oauth_userinfo GET /oauth/userinfo(.:format) doorkeeper/openid_connect/userinfo#show diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index f665dc31ee4..76ccdf3237c 100644 --- a/spec/routing/routing_spec.rb +++ b/spec/routing/routing_spec.rb @@ -369,3 +369,10 @@ RSpec.describe RunnerSetupController, 'routing' do expect(get("/-/runner_setup/platforms")).to route_to('runner_setup#platforms') end end + +# jwks GET /-/jwks(.:format) jwks#index +RSpec.describe JwksController, "routing" do + it "to #index" do + expect(get('/-/jwks')).to route_to('jwks#index') + end +end |