Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'private-pull-request-1617' into develop

Browse source
This commit is contained in:
Muhammad Nuzaihan 2018-02-05 21:32:36 +08:00
parent 4a31f32e45 c45e826551
commit 8de1064c24
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/object_manager_attributes_controller.rb
View file

@ -107,6 +107,11 @@ class ObjectManagerAttributesController < ApplicationController
if params[:data_option][:options][:true]
params[:data_option][:options][true] = params[:data_option][:options].delete(:true)
end
if params[:data_option][:default] == 'true'
params[:data_option][:default] = true
elsif params[:data_option][:default] == 'false'
params[:data_option][:default] = false
end
# rubocop:enable Lint/BooleanSymbol
end
end

36
test/controllers/object_manager_attributes_controller_test.rb Normal file
View file

@ -0,0 +1,36 @@
require 'test_helper'
class ObjectManagerAttributesControllerTest < ActionDispatch::IntegrationTest
setup do
# set accept header
@headers = { 'ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json' }
# create agent
roles = Role.where(name: 'Admin')
groups = Group.all
UserInfo.current_user_id = 1
@admin = User.create_or_update(
login: 'tickets-admin',
firstname: 'Tickets',
lastname: 'Admin',
email: 'tickets-admin@example.com',
password: 'adminpw',
active: true,
roles: roles,
groups: groups,
)
end
test '01 converts string to boolean for default value for boolean data type' do
credentials = ActionController::HttpAuthentication::Basic.encode_credentials('tickets-admin@example.com', 'adminpw')
post '/api/v1/object_manager_attributes', params: { 'name' => 'customdescription2', 'object' => 'Ticket', 'display' => 'custom description 2', 'active' => true, 'data_type' => 'boolean', 'data_option' => { 'options' => { 'true' => '', 'false' => '' }, 'default' => 'true' }, 'screens' => { 'create_middle' => { 'ticket.customer' => { 'shown' => true, 'item_class' => 'column' }, 'ticket.agent' => { 'shown' => true, 'item_class' => 'column' } }, 'edit' => { 'ticket.customer' => { 'shown' => true }, 'ticket.agent' => { 'shown' => true } } }, 'id' => 'c-192' }.to_json, headers: @headers.merge('Authorization' => credentials)
assert_response :success
result = JSON.parse @response.body
object = ObjectManager::Attribute.find result['id']
assert_equal true, object.data_option['default']
assert_equal 'boolean', object.data_type
object.destroy
end
end