Add json output for show user block api
This commit is contained in:
parent
71654e563e
commit
9442829d31
3 changed files with 26 additions and 0 deletions
13
app/views/api/user_blocks/_user_block.json.jbuilder
Normal file
13
app/views/api/user_blocks/_user_block.json.jbuilder
Normal file
|
@ -0,0 +1,13 @@
|
|||
json.user_block do
|
||||
json.id user_block.id
|
||||
json.created_at user_block.created_at.xmlschema
|
||||
json.updated_at user_block.updated_at.xmlschema
|
||||
json.ends_at user_block.ends_at.xmlschema
|
||||
json.needs_view user_block.needs_view
|
||||
|
||||
json.user :uid => user_block.user_id, :user => user_block.user.display_name
|
||||
json.creator :uid => user_block.creator_id, :user => user_block.creator.display_name
|
||||
json.revoker :uid => user_block.revoker_id, :user => user_block.revoker.display_name if user_block.revoker
|
||||
|
||||
json.reason user_block.reason
|
||||
end
|
3
app/views/api/user_blocks/show.json.jbuilder
Normal file
3
app/views/api/user_blocks/show.json.jbuilder
Normal file
|
@ -0,0 +1,3 @@
|
|||
json.partial! "api/root_attributes"
|
||||
|
||||
json.partial! @user_block
|
|
@ -7,6 +7,10 @@ module Api
|
|||
{ :path => "/api/0.6/user_blocks/1", :method => :get },
|
||||
{ :controller => "api/user_blocks", :action => "show", :id => "1" }
|
||||
)
|
||||
assert_routing(
|
||||
{ :path => "/api/0.6/user_blocks/1.json", :method => :get },
|
||||
{ :controller => "api/user_blocks", :action => "show", :id => "1", :format => "json" }
|
||||
)
|
||||
end
|
||||
|
||||
def test_show
|
||||
|
@ -15,6 +19,12 @@ module Api
|
|||
get api_user_block_path(:id => block)
|
||||
assert_response :success
|
||||
assert_select "user_block[id='#{block.id}']", 1
|
||||
|
||||
get api_user_block_path(:id => block, :format => "json")
|
||||
assert_response :success
|
||||
js = ActiveSupport::JSON.decode(@response.body)
|
||||
assert_not_nil js
|
||||
assert_equal block.id, js["user_block"]["id"]
|
||||
end
|
||||
|
||||
def test_show_not_found
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue