doorkeeper 5.0.3 → 5.1.0

data/spec/controllers/application_metal_controller_spec.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
-require 'spec_helper_integration'
+require "spec_helper_integration"
 
 describe Doorkeeper::ApplicationMetalController do
   controller(Doorkeeper::ApplicationMetalController) do
     def index
       render json: {}, status: 200
     end
+
+    def create
+      render json: {}, status: 200
+    end
   end
 
   it "lazy run hooks" do
@@ -16,35 +20,45 @@ describe Doorkeeper::ApplicationMetalController do
     expect(i).to eq 1
   end
 
-  describe 'enforce_content_type' do
+  describe "enforce_content_type" do
     before { allow(Doorkeeper.configuration).to receive(:enforce_content_type).and_return(flag) }
 
-    context 'enabled' do
+    context "enabled" do
       let(:flag) { true }
 
-      it '200 for the correct media type' do
-        get :index, params: {}, as: :url_encoded_form
+      it "returns a 200 for the requests without body" do
+        get :index, params: {}
         expect(response).to have_http_status 200
       end
 
-      it 'returns a 415 for an incorrect media type' do
-        get :index, as: :json
+      it "returns a 200 for the requests with body and correct media type" do
+        post :create, params: {}, as: :url_encoded_form
+        expect(response).to have_http_status 200
+      end
+
+      it "returns a 415 for the requests with body and incorrect media type" do
+        post :create, params: {}, as: :json
         expect(response).to have_http_status 415
       end
     end
 
-    context 'disabled' do
+    context "disabled" do
       let(:flag) { false }
 
-      it 'returns a 200 for the correct media type' do
+      it "returns a 200 for the correct media type" do
         get :index, as: :url_encoded_form
         expect(response).to have_http_status 200
       end
 
-      it 'returns a 200 for an incorrect media type' do
+      it "returns a 200 for an incorrect media type" do
         get :index, as: :json
         expect(response).to have_http_status 200
       end
+
+      it "returns a 200 for the requests with body and incorrect media type" do
+        post :create, params: {}, as: :json
+        expect(response).to have_http_status 200
+      end
     end
   end
 end

data/spec/controllers/applications_controller_spec.rb

@@ -1,8 +1,10 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 module Doorkeeper
   describe ApplicationsController do
-    context 'JSON API' do
+    context "JSON API" do
       render_views
 
       before do
@@ -10,81 +12,81 @@ module Doorkeeper
         allow(Doorkeeper.configuration).to receive(:authenticate_admin).and_return(->(*) { true })
       end
 
-      it 'creates an application' do
+      it "creates an application" do
         expect do
           post :create, params: {
             doorkeeper_application: {
-              name: 'Example',
-              redirect_uri: 'https://example.com'
-            }, format: :json
+              name: "Example",
+              redirect_uri: "https://example.com",
+            }, format: :json,
           }
         end.to(change { Doorkeeper::Application.count })
 
         expect(response).to be_successful
 
-        expect(json_response).to include('id', 'name', 'uid', 'secret', 'redirect_uri', 'scopes')
+        expect(json_response).to include("id", "name", "uid", "secret", "redirect_uri", "scopes")
 
-        expect(json_response['name']).to eq('Example')
-        expect(json_response['redirect_uri']).to eq('https://example.com')
+        expect(json_response["name"]).to eq("Example")
+        expect(json_response["redirect_uri"]).to eq("https://example.com")
       end
 
-      it 'returns validation errors on wrong create params' do
+      it "returns validation errors on wrong create params" do
         expect do
           post :create, params: {
             doorkeeper_application: {
-              name: 'Example'
-            }, format: :json
+              name: "Example",
+            }, format: :json,
           }
         end.not_to(change { Doorkeeper::Application.count })
 
         expect(response).to have_http_status(422)
 
-        expect(json_response).to include('errors')
+        expect(json_response).to include("errors")
       end
 
-      it 'returns application info' do
-        application = FactoryBot.create(:application, name: 'Change me')
+      it "returns application info" do
+        application = FactoryBot.create(:application, name: "Change me")
 
         get :show, params: { id: application.id, format: :json }
 
         expect(response).to be_successful
 
-        expect(json_response).to include('id', 'name', 'uid', 'secret', 'redirect_uri', 'scopes')
+        expect(json_response).to include("id", "name", "uid", "secret", "redirect_uri", "scopes")
       end
 
-      it 'updates application' do
-        application = FactoryBot.create(:application, name: 'Change me')
+      it "updates application" do
+        application = FactoryBot.create(:application, name: "Change me")
 
         put :update, params: {
           id: application.id,
           doorkeeper_application: {
-            name: 'Example App',
-            redirect_uri: 'https://example.com'
-          }, format: :json
+            name: "Example App",
+            redirect_uri: "https://example.com",
+          }, format: :json,
         }
 
-        expect(application.reload.name).to eq 'Example App'
+        expect(application.reload.name).to eq "Example App"
 
-        expect(json_response).to include('id', 'name', 'uid', 'secret', 'redirect_uri', 'scopes')
+        expect(json_response).to include("id", "name", "uid", "secret", "redirect_uri", "scopes")
       end
 
-      it 'returns validation errors on wrong update params' do
-        application = FactoryBot.create(:application, name: 'Change me')
+      it "returns validation errors on wrong update params" do
+        application = FactoryBot.create(:application, name: "Change me")
 
         put :update, params: {
           id: application.id,
           doorkeeper_application: {
-            name: 'Example App',
-            redirect_uri: 'localhost:3000'
-          }, format: :json
+            name: "Example App",
+            redirect_uri: "localhost:3000",
+          }, format: :json,
         }
 
         expect(response).to have_http_status(422)
 
-        expect(json_response).to include('errors')
+        expect(json_response).to include("errors")
       end
 
-      it 'destroys an application' do
+      it "destroys an application" do
         application = FactoryBot.create(:application)
 
         delete :destroy, params: { id: application.id, format: :json }
@@ -94,38 +96,38 @@ module Doorkeeper
       end
     end
 
-    context 'when admin is not authenticated' do
+    context "when admin is not authenticated" do
       before do
         allow(Doorkeeper.configuration).to receive(:authenticate_admin).and_return(proc do
           redirect_to main_app.root_url
         end)
       end
 
-      it 'redirects as set in Doorkeeper.authenticate_admin' do
+      it "redirects as set in Doorkeeper.authenticate_admin" do
         get :index
         expect(response).to redirect_to(controller.main_app.root_url)
       end
 
-      it 'does not create application' do
+      it "does not create application" do
         expect do
           post :create, params: {
             doorkeeper_application: {
-              name: 'Example',
-              redirect_uri: 'https://example.com'
-            }
+              name: "Example",
+              redirect_uri: "https://example.com",
+            },
           }
         end.not_to(change { Doorkeeper::Application.count })
       end
     end
 
-    context 'when admin is authenticated' do
+    context "when admin is authenticated" do
       render_views
 
       before do
         allow(Doorkeeper.configuration).to receive(:authenticate_admin).and_return(->(*) { true })
       end
 
-      it 'sorts applications by created_at' do
+      it "sorts applications by created_at" do
         first_application = FactoryBot.create(:application)
         second_application = FactoryBot.create(:application)
         expect(Doorkeeper::Application).to receive(:ordered_by).and_call_original
@@ -136,42 +138,42 @@ module Doorkeeper
         expect(response.body).to have_selector("tbody tr:last-child#application_#{second_application.id}")
       end
 
-      it 'creates application' do
+      it "creates application" do
         expect do
           post :create, params: {
             doorkeeper_application: {
-              name: 'Example',
-              redirect_uri: 'https://example.com'
-            }
+              name: "Example",
+              redirect_uri: "https://example.com",
+            },
           }
         end.to change { Doorkeeper::Application.count }.by(1)
 
         expect(response).to be_redirect
       end
 
-      it 'does not allow mass assignment of uid or secret' do
+      it "does not allow mass assignment of uid or secret" do
         application = FactoryBot.create(:application)
         put :update, params: {
           id: application.id,
           doorkeeper_application: {
-            uid: '1A2B3C4D',
-            secret: '1A2B3C4D'
-          }
+            uid: "1A2B3C4D",
+            secret: "1A2B3C4D",
+          },
         }
 
-        expect(application.reload.uid).not_to eq '1A2B3C4D'
+        expect(application.reload.uid).not_to eq "1A2B3C4D"
       end
 
-      it 'updates application' do
+      it "updates application" do
         application = FactoryBot.create(:application)
         put :update, params: {
           id: application.id, doorkeeper_application: {
-            name: 'Example',
-            redirect_uri: 'https://example.com'
-          }
+            name: "Example",
+            redirect_uri: "https://example.com",
+          },
         }
 
-        expect(application.reload.name).to eq 'Example'
+        expect(application.reload.name).to eq "Example"
       end
     end
   end