github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 18:41:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Adds support for a description to user fields.

Browse Source
This commit is contained in:
Robin Ward
2014-10-02 15:56:28 -04:00
parent 295a3c108e
commit 381814fd5d
22 changed files with 157 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/controllers/admin/user_fields_controller_spec.rb
View File

@ -12,7 +12,7 @@ describe Admin::UserFieldsController do
context '.create' do
it "creates a user field" do
-> {
xhr :post, :create, {user_field: {name: 'hello', field_type: 'text'} }
xhr :post, :create, {user_field: {name: 'hello', description: 'hello desc', field_type: 'text'} }
response.should be_success
}.should change(UserField, :count).by(1)
end
@ -44,7 +44,7 @@ describe Admin::UserFieldsController do
let!(:user_field) { Fabricate(:user_field) }
it "returns a list of user fields" do
xhr :put, :update, id: user_field.id, user_field: {name: 'fraggle', field_type: 'confirm'}
xhr :put, :update, id: user_field.id, user_field: {name: 'fraggle', field_type: 'confirm', description: 'muppet'}
response.should be_success
user_field.reload
user_field.name.should == 'fraggle'