diff --git a/app/controllers/api/v1/antennas_controller.rb b/app/controllers/api/v1/antennas_controller.rb index 37bfb7f552..7cb0c5f093 100644 --- a/app/controllers/api/v1/antennas_controller.rb +++ b/app/controllers/api/v1/antennas_controller.rb @@ -21,7 +21,7 @@ class Api::V1::AntennasController < Api::BaseController end def create - @antenna = Antenna.create!(antenna_params.merge(account: current_account, list_id: 0)) + @antenna = Antenna.create!({ list_id: 0 }.merge(antenna_params.merge(account: current_account))) render json: @antenna, serializer: REST::AntennaSerializer end diff --git a/spec/requests/api/v1/antennas_spec.rb b/spec/requests/api/v1/antennas_spec.rb index 3b4846bf06..913789fe99 100644 --- a/spec/requests/api/v1/antennas_spec.rb +++ b/spec/requests/api/v1/antennas_spec.rb @@ -120,6 +120,20 @@ RSpec.describe 'Antennas' do expect(Antenna.where(account: user.account).count).to eq(1) end + context 'when specify a list when create new' do + let(:list) { Fabricate(:list, account: user.account, title: 'ohagi') } + let(:params) { { title: 'my antenna', list_id: list.id.to_s, insert_feeds: 'true' } } + + it 'returns the new antenna with list', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(response.parsed_body).to match(a_hash_including(title: 'my antenna', insert_feeds: true)) + expect(response.parsed_body['list']).to match(a_hash_including(id: list.id.to_s, title: list.title)) + expect(Antenna.where(account: user.account).count).to eq(1) + end + end + context 'when a title is not given' do let(:params) { { title: '' } }