08c3e59aee
On our dev instance, /admin/applications as not loading because: 1. There was an unindexed query by `application_id`. 2. There was an expensive query that attempted to load 1 million unique entries via ActiveRecord just to find the unique count. We fix the first issue by adding an index for that column. We fix the second issue with a simple SELECT COUNT(DISTINCT resource_owner_id) SQL query. In addition, we add pagination to avoid loading more than 20 applications at once. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67228
82 lines
2.4 KiB
Ruby
82 lines
2.4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'spec_helper'
|
|
|
|
describe Admin::ApplicationsController do
|
|
let(:admin) { create(:admin) }
|
|
let(:application) { create(:oauth_application, owner_id: nil, owner_type: nil) }
|
|
|
|
before do
|
|
sign_in(admin)
|
|
end
|
|
|
|
describe 'GET #index' do
|
|
render_views
|
|
|
|
it 'renders the application form' do
|
|
get :index
|
|
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
end
|
|
|
|
describe 'GET #new' do
|
|
it 'renders the application form' do
|
|
get :new
|
|
|
|
expect(response).to render_template :new
|
|
expect(assigns[:scopes]).to be_kind_of(Doorkeeper::OAuth::Scopes)
|
|
end
|
|
end
|
|
|
|
describe 'GET #edit' do
|
|
it 'renders the application form' do
|
|
get :edit, params: { id: application.id }
|
|
|
|
expect(response).to render_template :edit
|
|
expect(assigns[:scopes]).to be_kind_of(Doorkeeper::OAuth::Scopes)
|
|
end
|
|
end
|
|
|
|
describe 'POST #create' do
|
|
it 'creates the application' do
|
|
create_params = attributes_for(:application, trusted: true)
|
|
|
|
expect do
|
|
post :create, params: { doorkeeper_application: create_params }
|
|
end.to change { Doorkeeper::Application.count }.by(1)
|
|
|
|
application = Doorkeeper::Application.last
|
|
|
|
expect(response).to redirect_to(admin_application_path(application))
|
|
expect(application).to have_attributes(create_params.except(:uid, :owner_type))
|
|
end
|
|
|
|
it 'renders the application form on errors' do
|
|
expect do
|
|
post :create, params: { doorkeeper_application: attributes_for(:application).merge(redirect_uri: nil) }
|
|
end.not_to change { Doorkeeper::Application.count }
|
|
|
|
expect(response).to render_template :new
|
|
expect(assigns[:scopes]).to be_kind_of(Doorkeeper::OAuth::Scopes)
|
|
end
|
|
end
|
|
|
|
describe 'PATCH #update' do
|
|
it 'updates the application' do
|
|
patch :update, params: { id: application.id, doorkeeper_application: { redirect_uri: 'http://example.com/', trusted: true } }
|
|
|
|
application.reload
|
|
|
|
expect(response).to redirect_to(admin_application_path(application))
|
|
expect(application).to have_attributes(redirect_uri: 'http://example.com/', trusted: true)
|
|
end
|
|
|
|
it 'renders the application form on errors' do
|
|
patch :update, params: { id: application.id, doorkeeper_application: { redirect_uri: nil } }
|
|
|
|
expect(response).to render_template :edit
|
|
expect(assigns[:scopes]).to be_kind_of(Doorkeeper::OAuth::Scopes)
|
|
end
|
|
end
|
|
end
|