From 6bd700379925746ea8408bb4d5b0c99dba1506e6 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 23 Feb 2023 05:28:56 -0500 Subject: Fix mispelled spec filenames (#23834) --- .../admin/change_email_controller_spec.rb | 47 ------------ .../admin/change_emails_controller_spec.rb | 47 ++++++++++++ spec/controllers/admin/users/roles_controller.rb | 83 ---------------------- .../admin/users/roles_controller_spec.rb | 83 ++++++++++++++++++++++ 4 files changed, 130 insertions(+), 130 deletions(-) delete mode 100644 spec/controllers/admin/change_email_controller_spec.rb create mode 100644 spec/controllers/admin/change_emails_controller_spec.rb delete mode 100644 spec/controllers/admin/users/roles_controller.rb create mode 100644 spec/controllers/admin/users/roles_controller_spec.rb (limited to 'spec/controllers/admin') diff --git a/spec/controllers/admin/change_email_controller_spec.rb b/spec/controllers/admin/change_email_controller_spec.rb deleted file mode 100644 index 832998471..000000000 --- a/spec/controllers/admin/change_email_controller_spec.rb +++ /dev/null @@ -1,47 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Admin::ChangeEmailsController, type: :controller do - render_views - - let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) } - - before do - sign_in admin - end - - describe 'GET #show' do - it 'returns http success' do - user = Fabricate(:user) - - get :show, params: { account_id: user.account.id } - - expect(response).to have_http_status(200) - end - end - - describe 'GET #update' do - before do - allow(UserMailer).to receive(:confirmation_instructions).and_return(double('email', deliver_later: nil)) - end - - it 'returns http success' do - user = Fabricate(:user) - - previous_email = user.email - - post :update, params: { account_id: user.account.id, user: { unconfirmed_email: 'test@example.com' } } - - user.reload - - expect(user.email).to eq previous_email - expect(user.unconfirmed_email).to eq 'test@example.com' - expect(user.confirmation_token).to_not be_nil - - expect(UserMailer).to have_received(:confirmation_instructions).with(user, user.confirmation_token, { to: 'test@example.com' }) - - expect(response).to redirect_to(admin_account_path(user.account.id)) - end - end -end diff --git a/spec/controllers/admin/change_emails_controller_spec.rb b/spec/controllers/admin/change_emails_controller_spec.rb new file mode 100644 index 000000000..832998471 --- /dev/null +++ b/spec/controllers/admin/change_emails_controller_spec.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Admin::ChangeEmailsController, type: :controller do + render_views + + let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) } + + before do + sign_in admin + end + + describe 'GET #show' do + it 'returns http success' do + user = Fabricate(:user) + + get :show, params: { account_id: user.account.id } + + expect(response).to have_http_status(200) + end + end + + describe 'GET #update' do + before do + allow(UserMailer).to receive(:confirmation_instructions).and_return(double('email', deliver_later: nil)) + end + + it 'returns http success' do + user = Fabricate(:user) + + previous_email = user.email + + post :update, params: { account_id: user.account.id, user: { unconfirmed_email: 'test@example.com' } } + + user.reload + + expect(user.email).to eq previous_email + expect(user.unconfirmed_email).to eq 'test@example.com' + expect(user.confirmation_token).to_not be_nil + + expect(UserMailer).to have_received(:confirmation_instructions).with(user, user.confirmation_token, { to: 'test@example.com' }) + + expect(response).to redirect_to(admin_account_path(user.account.id)) + end + end +end diff --git a/spec/controllers/admin/users/roles_controller.rb b/spec/controllers/admin/users/roles_controller.rb deleted file mode 100644 index fe2cee01b..000000000 --- a/spec/controllers/admin/users/roles_controller.rb +++ /dev/null @@ -1,83 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe Admin::Users::RolesController do - render_views - - let(:current_role) { UserRole.create(name: 'Foo', permissions: UserRole::FLAGS[:manage_roles], position: 10) } - let(:current_user) { Fabricate(:user, role: current_role) } - - let(:previous_role) { nil } - let(:user) { Fabricate(:user, role: previous_role) } - - before do - sign_in current_user, scope: :user - end - - describe 'GET #show' do - before do - get :show, params: { user_id: user.id } - end - - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - context 'when target user is higher ranked than current user' do - let(:previous_role) { UserRole.create(name: 'Baz', permissions: UserRole::FLAGS[:administrator], position: 100) } - - it 'returns http forbidden' do - expect(response).to have_http_status(403) - end - end - end - - describe 'PUT #update' do - let(:selected_role) { UserRole.create(name: 'Bar', permissions: permissions, position: position) } - - before do - put :update, params: { user_id: user.id, user: { role_id: selected_role.id } } - end - - context do - let(:permissions) { UserRole::FLAGS[:manage_roles] } - let(:position) { 1 } - - it 'updates user role' do - expect(user.reload.role_id).to eq selected_role&.id - end - - it 'redirects back to account page' do - expect(response).to redirect_to(admin_account_path(user.account_id)) - end - end - - context 'when selected role has higher position than current user\'s role' do - let(:permissions) { UserRole::FLAGS[:administrator] } - let(:position) { 100 } - - it 'does not update user role' do - expect(user.reload.role_id).to eq previous_role&.id - end - - it 'renders edit form' do - expect(response).to render_template(:show) - end - end - - context 'when target user is higher ranked than current user' do - let(:previous_role) { UserRole.create(name: 'Baz', permissions: UserRole::FLAGS[:administrator], position: 100) } - let(:permissions) { UserRole::FLAGS[:manage_roles] } - let(:position) { 1 } - - it 'does not update user role' do - expect(user.reload.role_id).to eq previous_role&.id - end - - it 'returns http forbidden' do - expect(response).to have_http_status(403) - end - end - end -end diff --git a/spec/controllers/admin/users/roles_controller_spec.rb b/spec/controllers/admin/users/roles_controller_spec.rb new file mode 100644 index 000000000..fe2cee01b --- /dev/null +++ b/spec/controllers/admin/users/roles_controller_spec.rb @@ -0,0 +1,83 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe Admin::Users::RolesController do + render_views + + let(:current_role) { UserRole.create(name: 'Foo', permissions: UserRole::FLAGS[:manage_roles], position: 10) } + let(:current_user) { Fabricate(:user, role: current_role) } + + let(:previous_role) { nil } + let(:user) { Fabricate(:user, role: previous_role) } + + before do + sign_in current_user, scope: :user + end + + describe 'GET #show' do + before do + get :show, params: { user_id: user.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + context 'when target user is higher ranked than current user' do + let(:previous_role) { UserRole.create(name: 'Baz', permissions: UserRole::FLAGS[:administrator], position: 100) } + + it 'returns http forbidden' do + expect(response).to have_http_status(403) + end + end + end + + describe 'PUT #update' do + let(:selected_role) { UserRole.create(name: 'Bar', permissions: permissions, position: position) } + + before do + put :update, params: { user_id: user.id, user: { role_id: selected_role.id } } + end + + context do + let(:permissions) { UserRole::FLAGS[:manage_roles] } + let(:position) { 1 } + + it 'updates user role' do + expect(user.reload.role_id).to eq selected_role&.id + end + + it 'redirects back to account page' do + expect(response).to redirect_to(admin_account_path(user.account_id)) + end + end + + context 'when selected role has higher position than current user\'s role' do + let(:permissions) { UserRole::FLAGS[:administrator] } + let(:position) { 100 } + + it 'does not update user role' do + expect(user.reload.role_id).to eq previous_role&.id + end + + it 'renders edit form' do + expect(response).to render_template(:show) + end + end + + context 'when target user is higher ranked than current user' do + let(:previous_role) { UserRole.create(name: 'Baz', permissions: UserRole::FLAGS[:administrator], position: 100) } + let(:permissions) { UserRole::FLAGS[:manage_roles] } + let(:position) { 1 } + + it 'does not update user role' do + expect(user.reload.role_id).to eq previous_role&.id + end + + it 'returns http forbidden' do + expect(response).to have_http_status(403) + end + end + end +end -- cgit