doorkeeper 5.0.3 → 5.1.0

data/spec/routing/custom_controller_routes_spec.rb

@@ -1,45 +1,51 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe 'Custom controller for routes' do
+require "spec_helper"
+
+describe "Custom controller for routes" do
   before :all do
+    Doorkeeper.configure do
+      orm DOORKEEPER_ORM
+    end
+
     Rails.application.routes.disable_clear_and_finalize = true
 
     Rails.application.routes.draw do
-      scope 'inner_space' do
-        use_doorkeeper scope: 'scope' do
-          controllers authorizations: 'custom_authorizations',
-                      tokens: 'custom_authorizations',
-                      applications: 'custom_authorizations',
-                      token_info: 'custom_authorizations'
-
-          as authorizations: 'custom_auth',
-             tokens: 'custom_token',
-             token_info: 'custom_token_info'
+      scope "inner_space" do
+        use_doorkeeper scope: "scope" do
+          controllers authorizations: "custom_authorizations",
+                      tokens: "custom_authorizations",
+                      applications: "custom_authorizations",
+                      token_info: "custom_authorizations"
+
+          as authorizations: "custom_auth",
+             tokens: "custom_token",
+             token_info: "custom_token_info"
         end
       end
 
-      scope 'space' do
+      scope "space" do
         use_doorkeeper do
-          controllers authorizations: 'custom_authorizations',
-                      tokens: 'custom_authorizations',
-                      applications: 'custom_authorizations',
-                      token_info: 'custom_authorizations'
-
-          as authorizations: 'custom_auth',
-             tokens: 'custom_token',
-             token_info: 'custom_token_info'
+          controllers authorizations: "custom_authorizations",
+                      tokens: "custom_authorizations",
+                      applications: "custom_authorizations",
+                      token_info: "custom_authorizations"
+
+          as authorizations: "custom_auth",
+             tokens: "custom_token",
+             token_info: "custom_token_info"
         end
       end
 
-      scope 'outer_space' do
+      scope "outer_space" do
         use_doorkeeper do
-          controllers authorizations: 'custom_authorizations',
-                      tokens: 'custom_authorizations',
-                      token_info: 'custom_authorizations'
+          controllers authorizations: "custom_authorizations",
+                      tokens: "custom_authorizations",
+                      token_info: "custom_authorizations"
 
-          as authorizations: 'custom_auth',
-             tokens: 'custom_token',
-             token_info: 'custom_token_info'
+          as authorizations: "custom_auth",
+             tokens: "custom_token",
+             token_info: "custom_token_info"
 
           skip_controllers :tokens, :applications, :token_info
         end
@@ -50,78 +56,78 @@ describe 'Custom controller for routes' do
   after :all do
     Rails.application.routes.clear!
 
-    load File.expand_path('../dummy/config/routes.rb', __dir__)
+    load File.expand_path("../dummy/config/routes.rb", __dir__)
   end
 
-  it 'GET /inner_space/scope/authorize routes to custom authorizations controller' do
-    expect(get('/inner_space/scope/authorize')).to route_to('custom_authorizations#new')
+  it "GET /inner_space/scope/authorize routes to custom authorizations controller" do
+    expect(get("/inner_space/scope/authorize")).to route_to("custom_authorizations#new")
   end
 
-  it 'POST /inner_space/scope/authorize routes to custom authorizations controller' do
-    expect(post('/inner_space/scope/authorize')).to route_to('custom_authorizations#create')
+  it "POST /inner_space/scope/authorize routes to custom authorizations controller" do
+    expect(post("/inner_space/scope/authorize")).to route_to("custom_authorizations#create")
   end
 
-  it 'DELETE /inner_space/scope/authorize routes to custom authorizations controller' do
-    expect(delete('/inner_space/scope/authorize')).to route_to('custom_authorizations#destroy')
+  it "DELETE /inner_space/scope/authorize routes to custom authorizations controller" do
+    expect(delete("/inner_space/scope/authorize")).to route_to("custom_authorizations#destroy")
   end
 
-  it 'POST /inner_space/scope/token routes to tokens controller' do
-    expect(post('/inner_space/scope/token')).to route_to('custom_authorizations#create')
+  it "POST /inner_space/scope/token routes to tokens controller" do
+    expect(post("/inner_space/scope/token")).to route_to("custom_authorizations#create")
   end
 
-  it 'GET /inner_space/scope/applications routes to applications controller' do
-    expect(get('/inner_space/scope/applications')).to route_to('custom_authorizations#index')
+  it "GET /inner_space/scope/applications routes to applications controller" do
+    expect(get("/inner_space/scope/applications")).to route_to("custom_authorizations#index")
   end
 
-  it 'GET /inner_space/scope/token/info routes to the token_info controller' do
-    expect(get('/inner_space/scope/token/info')).to route_to('custom_authorizations#show')
+  it "GET /inner_space/scope/token/info routes to the token_info controller" do
+    expect(get("/inner_space/scope/token/info")).to route_to("custom_authorizations#show")
   end
 
-  it 'GET /space/oauth/authorize routes to custom authorizations controller' do
-    expect(get('/space/oauth/authorize')).to route_to('custom_authorizations#new')
+  it "GET /space/oauth/authorize routes to custom authorizations controller" do
+    expect(get("/space/oauth/authorize")).to route_to("custom_authorizations#new")
   end
 
-  it 'POST /space/oauth/authorize routes to custom authorizations controller' do
-    expect(post('/space/oauth/authorize')).to route_to('custom_authorizations#create')
+  it "POST /space/oauth/authorize routes to custom authorizations controller" do
+    expect(post("/space/oauth/authorize")).to route_to("custom_authorizations#create")
   end
 
-  it 'DELETE /space/oauth/authorize routes to custom authorizations controller' do
-    expect(delete('/space/oauth/authorize')).to route_to('custom_authorizations#destroy')
+  it "DELETE /space/oauth/authorize routes to custom authorizations controller" do
+    expect(delete("/space/oauth/authorize")).to route_to("custom_authorizations#destroy")
   end
 
-  it 'POST /space/oauth/token routes to tokens controller' do
-    expect(post('/space/oauth/token')).to route_to('custom_authorizations#create')
+  it "POST /space/oauth/token routes to tokens controller" do
+    expect(post("/space/oauth/token")).to route_to("custom_authorizations#create")
   end
 
-  it 'POST /space/oauth/revoke routes to tokens controller' do
-    expect(post('/space/oauth/revoke')).to route_to('custom_authorizations#revoke')
+  it "POST /space/oauth/revoke routes to tokens controller" do
+    expect(post("/space/oauth/revoke")).to route_to("custom_authorizations#revoke")
   end
 
-  it 'POST /space/oauth/introspect routes to tokens controller' do
-    expect(post('/space/oauth/introspect')).to route_to('custom_authorizations#introspect')
+  it "POST /space/oauth/introspect routes to tokens controller" do
+    expect(post("/space/oauth/introspect")).to route_to("custom_authorizations#introspect")
   end
 
-  it 'GET /space/oauth/applications routes to applications controller' do
-    expect(get('/space/oauth/applications')).to route_to('custom_authorizations#index')
+  it "GET /space/oauth/applications routes to applications controller" do
+    expect(get("/space/oauth/applications")).to route_to("custom_authorizations#index")
   end
 
-  it 'GET /space/oauth/token/info routes to the token_info controller' do
-    expect(get('/space/oauth/token/info')).to route_to('custom_authorizations#show')
+  it "GET /space/oauth/token/info routes to the token_info controller" do
+    expect(get("/space/oauth/token/info")).to route_to("custom_authorizations#show")
   end
 
-  it 'POST /outer_space/oauth/token is not be routable' do
-    expect(post('/outer_space/oauth/token')).not_to be_routable
+  it "POST /outer_space/oauth/token is not be routable" do
+    expect(post("/outer_space/oauth/token")).not_to be_routable
   end
 
-  it 'GET /outer_space/oauth/authorize routes to custom authorizations controller' do
-    expect(get('/outer_space/oauth/authorize')).to be_routable
+  it "GET /outer_space/oauth/authorize routes to custom authorizations controller" do
+    expect(get("/outer_space/oauth/authorize")).to be_routable
   end
 
-  it 'GET /outer_space/oauth/applications is not routable' do
-    expect(get('/outer_space/oauth/applications')).not_to be_routable
+  it "GET /outer_space/oauth/applications is not routable" do
+    expect(get("/outer_space/oauth/applications")).not_to be_routable
   end
 
-  it 'GET /outer_space/oauth/token_info is not routable' do
-    expect(get('/outer_space/oauth/token/info')).not_to be_routable
+  it "GET /outer_space/oauth/token_info is not routable" do
+    expect(get("/outer_space/oauth/token/info")).not_to be_routable
   end
 end

data/spec/routing/default_routes_spec.rb

@@ -1,39 +1,41 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe 'Default routes' do
-  it 'GET /oauth/authorize routes to authorizations controller' do
-    expect(get('/oauth/authorize')).to route_to('doorkeeper/authorizations#new')
+require "spec_helper"
+
+describe "Default routes" do
+  it "GET /oauth/authorize routes to authorizations controller" do
+    expect(get("/oauth/authorize")).to route_to("doorkeeper/authorizations#new")
   end
 
-  it 'POST /oauth/authorize routes to authorizations controller' do
-    expect(post('/oauth/authorize')).to route_to('doorkeeper/authorizations#create')
+  it "POST /oauth/authorize routes to authorizations controller" do
+    expect(post("/oauth/authorize")).to route_to("doorkeeper/authorizations#create")
   end
 
-  it 'DELETE /oauth/authorize routes to authorizations controller' do
-    expect(delete('/oauth/authorize')).to route_to('doorkeeper/authorizations#destroy')
+  it "DELETE /oauth/authorize routes to authorizations controller" do
+    expect(delete("/oauth/authorize")).to route_to("doorkeeper/authorizations#destroy")
   end
 
-  it 'POST /oauth/token routes to tokens controller' do
-    expect(post('/oauth/token')).to route_to('doorkeeper/tokens#create')
+  it "POST /oauth/token routes to tokens controller" do
+    expect(post("/oauth/token")).to route_to("doorkeeper/tokens#create")
   end
 
-  it 'POST /oauth/revoke routes to tokens controller' do
-    expect(post('/oauth/revoke')).to route_to('doorkeeper/tokens#revoke')
+  it "POST /oauth/revoke routes to tokens controller" do
+    expect(post("/oauth/revoke")).to route_to("doorkeeper/tokens#revoke")
   end
 
-  it 'POST /oauth/introspect routes to tokens controller' do
-    expect(post('/oauth/introspect')).to route_to('doorkeeper/tokens#introspect')
+  it "POST /oauth/introspect routes to tokens controller" do
+    expect(post("/oauth/introspect")).to route_to("doorkeeper/tokens#introspect")
   end
 
-  it 'GET /oauth/applications routes to applications controller' do
-    expect(get('/oauth/applications')).to route_to('doorkeeper/applications#index')
+  it "GET /oauth/applications routes to applications controller" do
+    expect(get("/oauth/applications")).to route_to("doorkeeper/applications#index")
   end
 
-  it 'GET /oauth/authorized_applications routes to authorized applications controller' do
-    expect(get('/oauth/authorized_applications')).to route_to('doorkeeper/authorized_applications#index')
+  it "GET /oauth/authorized_applications routes to authorized applications controller" do
+    expect(get("/oauth/authorized_applications")).to route_to("doorkeeper/authorized_applications#index")
   end
 
-  it 'GET /oauth/token/info route to authorized TokenInfo controller' do
-    expect(get('/oauth/token/info')).to route_to('doorkeeper/token_info#show')
+  it "GET /oauth/token/info route to authorized TokenInfo controller" do
+    expect(get("/oauth/token/info")).to route_to("doorkeeper/token_info#show")
   end
 end

data/spec/routing/scoped_routes_spec.rb

@@ -1,45 +1,47 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe 'Scoped routes' do
+require "spec_helper"
+
+describe "Scoped routes" do
   before :all do
     Rails.application.routes.disable_clear_and_finalize = true
 
     Rails.application.routes.draw do
-      use_doorkeeper scope: 'scope'
+      use_doorkeeper scope: "scope"
     end
   end
 
   after :all do
     Rails.application.routes.clear!
 
-    load File.expand_path('../dummy/config/routes.rb', __dir__)
+    load File.expand_path("../dummy/config/routes.rb", __dir__)
   end
 
-  it 'GET /scope/authorize routes to authorizations controller' do
-    expect(get('/scope/authorize')).to route_to('doorkeeper/authorizations#new')
+  it "GET /scope/authorize routes to authorizations controller" do
+    expect(get("/scope/authorize")).to route_to("doorkeeper/authorizations#new")
   end
 
-  it 'POST /scope/authorize routes to authorizations controller' do
-    expect(post('/scope/authorize')).to route_to('doorkeeper/authorizations#create')
+  it "POST /scope/authorize routes to authorizations controller" do
+    expect(post("/scope/authorize")).to route_to("doorkeeper/authorizations#create")
   end
 
-  it 'DELETE /scope/authorize routes to authorizations controller' do
-    expect(delete('/scope/authorize')).to route_to('doorkeeper/authorizations#destroy')
+  it "DELETE /scope/authorize routes to authorizations controller" do
+    expect(delete("/scope/authorize")).to route_to("doorkeeper/authorizations#destroy")
   end
 
-  it 'POST /scope/token routes to tokens controller' do
-    expect(post('/scope/token')).to route_to('doorkeeper/tokens#create')
+  it "POST /scope/token routes to tokens controller" do
+    expect(post("/scope/token")).to route_to("doorkeeper/tokens#create")
   end
 
-  it 'GET /scope/applications routes to applications controller' do
-    expect(get('/scope/applications')).to route_to('doorkeeper/applications#index')
+  it "GET /scope/applications routes to applications controller" do
+    expect(get("/scope/applications")).to route_to("doorkeeper/applications#index")
   end
 
-  it 'GET /scope/authorized_applications routes to authorized applications controller' do
-    expect(get('/scope/authorized_applications')).to route_to('doorkeeper/authorized_applications#index')
+  it "GET /scope/authorized_applications routes to authorized applications controller" do
+    expect(get("/scope/authorized_applications")).to route_to("doorkeeper/authorized_applications#index")
   end
 
-  it 'GET /scope/token/info route to authorized TokenInfo controller' do
-    expect(get('/scope/token/info')).to route_to('doorkeeper/token_info#show')
+  it "GET /scope/token/info route to authorized TokenInfo controller" do
+    expect(get("/scope/token/info")).to route_to("doorkeeper/token_info#show")
   end
 end

data/spec/spec_helper.rb

@@ -1,11 +1,13 @@
-require 'coveralls'
+# frozen_string_literal: true
 
-Coveralls.wear!('rails') do
-  add_filter('/spec/')
-  add_filter('/lib/generators/doorkeeper/templates/')
+require "coveralls"
+
+Coveralls.wear!("rails") do
+  add_filter("/spec/")
+  add_filter("/lib/generators/doorkeeper/templates/")
 end
 
-ENV['RAILS_ENV'] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
 
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
@@ -13,22 +15,22 @@ require "#{File.dirname(__FILE__)}/support/doorkeeper_rspec.rb"
 
 DOORKEEPER_ORM = Doorkeeper::RSpec.detect_orm
 
-require 'dummy/config/environment'
-require 'rspec/rails'
-require 'capybara/rspec'
-require 'database_cleaner'
-require 'generator_spec/test_case'
+require "dummy/config/environment"
+require "rspec/rails"
+require "capybara/rspec"
+require "database_cleaner"
+require "generator_spec/test_case"
 
 # Load JRuby SQLite3 if in that platform
 if defined? JRUBY_VERSION
-  require 'jdbc/sqlite3'
+  require "jdbc/sqlite3"
   Jdbc::SQLite3.load_driver
 end
 
 Doorkeeper::RSpec.print_configuration_info
 
 # Remove after dropping support of Rails 4.2
-require "#{File.dirname(__FILE__)}/support/http_method_shim.rb"
+require "#{File.dirname(__FILE__)}/support/http_method_shim"
 
 require "support/orm/#{DOORKEEPER_ORM}"
 
@@ -51,5 +53,5 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
-  config.order = 'random'
+  config.order = "random"
 end

data/spec/spec_helper_integration.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 # For compatibility only
-require 'spec_helper'
+require "spec_helper"

data/spec/support/dependencies/factory_bot.rb

@@ -1,2 +1,4 @@
-require 'factory_bot'
+# frozen_string_literal: true
+
+require "factory_bot"
 FactoryBot.find_definitions

data/spec/support/doorkeeper_rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   class RSpec
     # Print's useful information about env: Ruby / Rails versions,
@@ -13,7 +15,7 @@ module Doorkeeper
 
     # Tries to find ORM from the Gemfile used to run test suite
     def self.detect_orm
-      orm = (ENV['BUNDLE_GEMFILE'] || '').match(/Gemfile\.(.+)\.rb/)
+      orm = (ENV["BUNDLE_GEMFILE"] || "").match(/Gemfile\.(.+)\.rb/)
       (orm && orm[1] || :active_record).to_sym
     end
   end

data/spec/support/helpers/access_token_request_helper.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module AccessTokenRequestHelper
   def client_is_authorized(client, resource_owner, access_token_attributes = {})
     attributes = {
       application: client,
-      resource_owner_id: resource_owner.id
+      resource_owner_id: resource_owner.id,
     }.merge(access_token_attributes)
     FactoryBot.create(:access_token, attributes)
   end

data/spec/support/helpers/authorization_request_helper.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module AuthorizationRequestHelper
   def resource_owner_is_authenticated(resource_owner = nil)
-    resource_owner ||= User.create!(name: 'Joe', password: 'sekret')
+    resource_owner ||= User.create!(name: "Joe", password: "sekret")
     Doorkeeper.configuration.instance_variable_set(:@authenticate_resource_owner, proc { resource_owner })
   end
 
   def resource_owner_is_not_authenticated
-    Doorkeeper.configuration.instance_variable_set(:@authenticate_resource_owner, proc { redirect_to('/sign_in') })
+    Doorkeeper.configuration.instance_variable_set(:@authenticate_resource_owner, proc { redirect_to("/sign_in") })
   end
 
   def default_scopes_exist(*scopes)

data/spec/support/helpers/config_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ConfigHelper
   def config_is_set(setting, value = nil, &block)
     setting_ivar = "@#{setting}"

data/spec/support/helpers/model_helper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ModelHelper
   def client_exists(client_attributes = {})
     @client = FactoryBot.create(:application, client_attributes)
   end
 
   def create_resource_owner
-    @resource_owner = User.create!(name: 'Joe', password: 'sekret')
+    @resource_owner = User.create!(name: "Joe", password: "sekret")
   end
 
   def authorization_code_exists(options = {})

data/spec/support/helpers/request_spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RequestSpecHelper
   def i_am_logged_in
     allow(Doorkeeper.configuration).to receive(:authenticate_admin).and_return(->(*) {})
@@ -48,7 +50,7 @@ module RequestSpecHelper
   end
 
   def with_access_token_header(token)
-    with_header 'Authorization', "Bearer #{token}"
+    with_header "Authorization", "Bearer #{token}"
   end
 
   def with_header(header, value)
@@ -72,8 +74,8 @@ module RequestSpecHelper
   end
 
   def sign_in
-    visit '/'
-    click_on 'Sign in'
+    visit "/"
+    click_on "Sign in"
   end
 
   def create_access_token(authorization_code, client, code_verifier = nil)

data/spec/support/helpers/url_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UrlHelper
   def token_endpoint_url(options = {})
     parameters = {
@@ -5,9 +7,9 @@ module UrlHelper
       client_id: options[:client_id] || options[:client].try(:uid),
       client_secret: options[:client_secret] || options[:client].try(:secret),
       redirect_uri: options[:redirect_uri] || options[:client].try(:redirect_uri),
-      grant_type: options[:grant_type] || 'authorization_code',
+      grant_type: options[:grant_type] || "authorization_code",
       code_verifier: options[:code_verifier],
-      code_challenge_method: options[:code_challenge_method]
+      code_challenge_method: options[:code_challenge_method],
     }.reject { |_, v| v.blank? }
     "/oauth/token?#{build_query(parameters)}"
   end
@@ -20,7 +22,7 @@ module UrlHelper
       username: options[:resource_owner_username] || options[:resource_owner].try(:name),
       password: options[:resource_owner_password] || options[:resource_owner].try(:password),
       scope: options[:scope],
-      grant_type: 'password'
+      grant_type: "password",
     }
     "/oauth/token?#{build_query(parameters)}"
   end
@@ -29,11 +31,11 @@ module UrlHelper
     parameters = {
       client_id: options[:client_id] || options[:client].try(:uid),
       redirect_uri: options[:redirect_uri] || options[:client].try(:redirect_uri),
-      response_type: options[:response_type] || 'code',
+      response_type: options[:response_type] || "code",
       scope: options[:scope],
       state: options[:state],
       code_challenge: options[:code_challenge],
-      code_challenge_method: options[:code_challenge_method]
+      code_challenge_method: options[:code_challenge_method],
     }.reject { |_, v| v.blank? }
     "/oauth/authorize?#{build_query(parameters)}"
   end
@@ -43,13 +45,13 @@ module UrlHelper
       refresh_token: options[:refresh_token],
       client_id: options[:client_id] || options[:client].try(:uid),
       client_secret: options[:client_secret] || options[:client].try(:secret),
-      grant_type: options[:grant_type] || 'refresh_token'
+      grant_type: options[:grant_type] || "refresh_token",
     }
     "/oauth/token?#{build_query(parameters)}"
   end
 
   def revocation_token_endpoint_url
-    '/oauth/revoke'
+    "/oauth/revoke"
   end
 
   def build_query(hash)

data/spec/support/http_method_shim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Rails 5 deprecates calling HTTP action methods with positional arguments
 # in favor of keyword arguments. However, the keyword argument form is only
 # supported in Rails 5+. Since we support back to 4, we need some sort of shim
@@ -17,18 +19,11 @@ module RoutingHTTPMethodShim
 end
 
 module ControllerHTTPMethodShim
-  def process(action, http_method = 'GET', **args)
+  def process(action, http_method = "GET", **args)
     if (as = args.delete(:as))
-      @request.headers['Content-Type'] = Mime[as].to_s
+      @request.headers["Content-Type"] = Mime[as].to_s
     end
 
     super(action, http_method, args[:params], args[:session], args[:flash])
   end
 end
-
-if ::Rails::VERSION::MAJOR < 5
-  RSpec.configure do |config|
-    config.include ControllerHTTPMethodShim, type: :controller
-    config.include RoutingHTTPMethodShim, type: :request
-  end
-end

data/spec/support/orm/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # load schema to in memory sqlite
 ActiveRecord::Migration.verbose = false
-load Rails.root + 'db/schema.rb'
+load Rails.root + "db/schema.rb"