Merge branch 'master' into update_if_block
commit
a81635b9cd
|
@ -16,7 +16,7 @@ module Api
|
|||
if raw_json[:tools]
|
||||
mutate Tools::BatchUpdate.run(raw_json, device: current_device)
|
||||
else
|
||||
mutate Tools::Create.run(create_params)
|
||||
mutate Tools::Create.run(raw_json, device: current_device)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -32,16 +32,6 @@ private
|
|||
output
|
||||
end
|
||||
|
||||
def create_params
|
||||
if @create_params
|
||||
@create_params
|
||||
else
|
||||
@create_params = { name: params[:name],
|
||||
device: current_device }
|
||||
@create_params
|
||||
end
|
||||
end
|
||||
|
||||
def tools
|
||||
Tool.where(device: current_device)
|
||||
end
|
||||
|
|
|
@ -11,7 +11,7 @@ describe Api::ToolsController do
|
|||
sign_in user
|
||||
payload = { tool_slot_id: tool_slot.id, name: "wow" }
|
||||
old_tool_count = Tool.count
|
||||
post :create, params: payload
|
||||
post :create, body: payload.to_json, params: {format: :json}
|
||||
expect(response.status).to eq(200)
|
||||
expect(Tool.count).to be > old_tool_count
|
||||
expect(json[:name]).to eq("wow")
|
||||
|
@ -21,7 +21,7 @@ describe Api::ToolsController do
|
|||
sign_in user
|
||||
payload = { name: "wow2" }
|
||||
old_tool_count = Tool.count
|
||||
post :create, params: payload
|
||||
post :create, body: payload.to_json, params: {format: :json}
|
||||
expect(response.status).to eq(200)
|
||||
expect(Tool.count).to be > old_tool_count
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue