doorkeeper 5.1.0.rc2 → 5.1.0

data/spec/requests/protected_resources/metal_spec.rb

@@ -1,14 +1,16 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe 'ActionController::Metal API' do
+require "spec_helper"
+
+describe "ActionController::Metal API" do
   before do
     @client   = FactoryBot.create(:application)
-    @resource = User.create!(name: 'Joe', password: 'sekret')
+    @resource = User.create!(name: "Joe", password: "sekret")
     @token    = client_is_authorized(@client, @resource)
   end
 
-  it 'client requests protected resource with valid token' do
+  it "client requests protected resource with valid token" do
     get "/metal.json?access_token=#{@token.token}"
-    should_have_json 'ok', true
+    should_have_json "ok", true
   end
 end

data/spec/requests/protected_resources/private_api_spec.rb

@@ -1,81 +1,83 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-feature 'Private API' do
+require "spec_helper"
+
+feature "Private API" do
   background do
     @client   = FactoryBot.create(:application)
-    @resource = User.create!(name: 'Joe', password: 'sekret')
+    @resource = User.create!(name: "Joe", password: "sekret")
     @token    = client_is_authorized(@client, @resource)
   end
 
-  scenario 'client requests protected resource with valid token' do
+  scenario "client requests protected resource with valid token" do
     with_access_token_header @token.token
-    visit '/full_protected_resources'
-    expect(page.body).to have_content('index')
+    visit "/full_protected_resources"
+    expect(page.body).to have_content("index")
   end
 
-  scenario 'client requests protected resource with disabled header authentication' do
+  scenario "client requests protected resource with disabled header authentication" do
     config_is_set :access_token_methods, [:from_access_token_param]
     with_access_token_header @token.token
-    visit '/full_protected_resources'
+    visit "/full_protected_resources"
     response_status_should_be 401
   end
 
-  scenario 'client attempts to request protected resource with invalid token' do
-    with_access_token_header 'invalid'
-    visit '/full_protected_resources'
+  scenario "client attempts to request protected resource with invalid token" do
+    with_access_token_header "invalid"
+    visit "/full_protected_resources"
     response_status_should_be 401
   end
 
-  scenario 'client attempts to request protected resource with expired token' do
+  scenario "client attempts to request protected resource with expired token" do
     @token.update_attribute :expires_in, -100 # expires token
     with_access_token_header @token.token
-    visit '/full_protected_resources'
+    visit "/full_protected_resources"
     response_status_should_be 401
   end
 
-  scenario 'client requests protected resource with permanent token' do
+  scenario "client requests protected resource with permanent token" do
     @token.update_attribute :expires_in, nil # never expires
     with_access_token_header @token.token
-    visit '/full_protected_resources'
-    expect(page.body).to have_content('index')
+    visit "/full_protected_resources"
+    expect(page.body).to have_content("index")
   end
 
-  scenario 'access token with no default scopes' do
+  scenario "access token with no default scopes" do
     Doorkeeper.configuration.instance_eval do
       @default_scopes = Doorkeeper::OAuth::Scopes.from_array([:public])
       @scopes = default_scopes + optional_scopes
     end
-    @token.update_attribute :scopes, 'dummy'
+    @token.update_attribute :scopes, "dummy"
     with_access_token_header @token.token
-    visit '/full_protected_resources'
+    visit "/full_protected_resources"
     response_status_should_be 403
   end
 
-  scenario 'access token with no allowed scopes' do
+  scenario "access token with no allowed scopes" do
     @token.update_attribute :scopes, nil
     with_access_token_header @token.token
-    visit '/full_protected_resources/1.json'
+    visit "/full_protected_resources/1.json"
     response_status_should_be 403
   end
 
-  scenario 'access token with one of allowed scopes' do
-    @token.update_attribute :scopes, 'admin'
+  scenario "access token with one of allowed scopes" do
+    @token.update_attribute :scopes, "admin"
     with_access_token_header @token.token
-    visit '/full_protected_resources/1.json'
-    expect(page.body).to have_content('show')
+    visit "/full_protected_resources/1.json"
+    expect(page.body).to have_content("show")
   end
 
-  scenario 'access token with another of allowed scopes' do
-    @token.update_attribute :scopes, 'write'
+  scenario "access token with another of allowed scopes" do
+    @token.update_attribute :scopes, "write"
     with_access_token_header @token.token
-    visit '/full_protected_resources/1.json'
-    expect(page.body).to have_content('show')
+    visit "/full_protected_resources/1.json"
+    expect(page.body).to have_content("show")
   end
 
-  scenario 'access token with both allowed scopes' do
-    @token.update_attribute :scopes, 'write admin'
+  scenario "access token with both allowed scopes" do
+    @token.update_attribute :scopes, "write admin"
     with_access_token_header @token.token
-    visit '/full_protected_resources/1.json'
-    expect(page.body).to have_content('show')
+    visit "/full_protected_resources/1.json"
+    expect(page.body).to have_content("show")
   end
 end

data/spec/routing/custom_controller_routes_spec.rb

@@ -1,6 +1,8 @@
-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
@@ -9,41 +11,41 @@ describe 'Custom controller for routes' do
     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
@@ -54,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