remove user deletion until further notice
This commit is contained in:
parent
bca62e6204
commit
80fbc144ac
4 changed files with 1 additions and 42 deletions
|
|
@ -35,10 +35,5 @@ module Admin
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit; end
|
def edit; end
|
||||||
|
|
||||||
def destroy
|
|
||||||
@user.destroy
|
|
||||||
redirect_to admin_users_path, notice: 'User got deleted'
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@
|
||||||
%th Roles
|
%th Roles
|
||||||
%th View
|
%th View
|
||||||
%th Edit
|
%th Edit
|
||||||
%th Delete
|
|
||||||
%tbody
|
%tbody
|
||||||
- @users.each do |user|
|
- @users.each do |user|
|
||||||
%tr
|
%tr
|
||||||
|
|
@ -48,11 +47,3 @@
|
||||||
- if can? :update, user
|
- if can? :update, user
|
||||||
%td
|
%td
|
||||||
= link_to 'Edit', edit_admin_user_path(user), class: 'btn btn-primary'
|
= link_to 'Edit', edit_admin_user_path(user), class: 'btn btn-primary'
|
||||||
- if can? :destroy, user
|
|
||||||
%td
|
|
||||||
- if current_user.id == user.id or user.role_ids.include? 3
|
|
||||||
= link_to 'Delete',admin_user_path(user), :method => :delete , :data => {:confirm => 'Are you sure ?'},
|
|
||||||
disabled: true, class: 'btn btn-primary disabled btn-danger', role: 'button'
|
|
||||||
- else
|
|
||||||
= link_to 'Delete',admin_user_path(user), method: :delete,
|
|
||||||
data: { confirm: 'Are you sure ?' }, class: 'btn btn-primary btn-danger'
|
|
||||||
|
|
@ -36,19 +36,4 @@ describe Admin::UsersController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
describe 'DELETE #destroy' do
|
|
||||||
before :each do
|
|
||||||
@user = create(:user)
|
|
||||||
end
|
|
||||||
context 'valid attributes' do
|
|
||||||
it 'it deletes the contact' do
|
|
||||||
expect { delete :destroy, id: @user.id }.to change(User, :count).by(-1)
|
|
||||||
end
|
|
||||||
it 'redirects to users#index' do
|
|
||||||
delete :destroy, id: @user
|
|
||||||
expect(response).to redirect_to admin_users_path
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -3,19 +3,7 @@ require 'spec_helper'
|
||||||
feature User do
|
feature User do
|
||||||
|
|
||||||
shared_examples 'admin ability' do
|
shared_examples 'admin ability' do
|
||||||
scenario 'deletes a user', feature: true, js: true do
|
|
||||||
sign_in(create(:admin))
|
|
||||||
visit admin_users_path
|
|
||||||
expected_count = User.count - 1
|
|
||||||
page.all('btn btn-primary btn-danger') do
|
|
||||||
click_link 'Delete'
|
|
||||||
page.evaluate_script('window.confirm = function() { return true; }')
|
|
||||||
page.click('OK')
|
|
||||||
expect(flash).to eq('User got deleted')
|
|
||||||
expect(User.count).to eq(expected_count)
|
|
||||||
end
|
|
||||||
sign_out
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'admin' do
|
describe 'admin' do
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue