mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-23 23:58:31 -05:00
Raise 404 from Admin::UsersController#show if no user found
[Fixes #353]
This commit is contained in:
parent
6edabdfec1
commit
c4f1cb0d7b
2 changed files with 15 additions and 5 deletions
|
@ -16,6 +16,7 @@ class Admin::UsersController < Admin::AdminController
|
|||
|
||||
def show
|
||||
@user = User.where(username_lower: params[:id]).first
|
||||
raise Discourse::NotFound.new unless @user
|
||||
render_serialized(@user, AdminDetailedUserSerializer, root: false)
|
||||
end
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Admin::UsersController do
|
||||
|
||||
it "is a subclass of AdminController" do
|
||||
it 'is a subclass of AdminController' do
|
||||
(Admin::UsersController < Admin::AdminController).should be_true
|
||||
end
|
||||
|
||||
|
@ -23,10 +23,19 @@ describe Admin::UsersController do
|
|||
end
|
||||
end
|
||||
|
||||
context '.show' do
|
||||
it 'returns success' do
|
||||
xhr :get, :show, id: @user.username
|
||||
response.should be_success
|
||||
describe '.show' do
|
||||
context 'an existing user' do
|
||||
it 'returns success' do
|
||||
xhr :get, :show, id: @user.username
|
||||
response.should be_success
|
||||
end
|
||||
end
|
||||
|
||||
context 'an existing user' do
|
||||
it 'returns success' do
|
||||
xhr :get, :show, id: 'foobar'
|
||||
response.should_not be_success
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue