Skip to content

Commit

Permalink
Merge pull request SolucaoOnlineDeLicitacao#24 from car-bahia/refused…
Browse files Browse the repository at this point in the history
…_contract_bug_master_bahia

Refused contract bug master bahia
  • Loading branch information
alexandrecrvg authored Dec 20, 2021
2 parents 9b1430d + a3c6f72 commit d815dbe
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/models/bidding.rb
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def proposals_for_retry_by_lot(lot_ids)
proposals.
joins(:lot_proposals).
where(
status: %i[sent accepted refused],
status: %i[sent accepted],
lot_proposals: { lot_id: lot_ids }
)
end
Expand Down
6 changes: 3 additions & 3 deletions spec/models/bidding_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@
let!(:proposal_5) { create(:proposal, bidding: bidding, lot: lot_2, status: :sent) }
let(:scope_params) { proposal_1.current_lot_ids }

it { is_expected.to match_array [proposal_2, proposal_3, proposal_4] }
it { is_expected.to match_array [proposal_2, proposal_3] }
end

context 'when the bidding kind is global' do
Expand All @@ -619,7 +619,7 @@
let!(:proposal_5) { create(:proposal, bidding: bidding, status: :sent) }
let(:scope_params) { bidding.lot_ids }

it { is_expected.to match_array [proposal_2, proposal_3, proposal_4, proposal_5] }
it { is_expected.to match_array [proposal_2, proposal_3, proposal_5] }
end
end

Expand Down Expand Up @@ -663,7 +663,7 @@
end
end

fdescribe '.fully_refused_proposals?' do
describe '.fully_refused_proposals?' do
let!(:bidding) { create(:bidding) }
let(:refused_proposal_1) { create(:proposal, bidding: bidding, status: :refused) }
let(:refused_proposal_2) { create(:proposal, bidding: bidding, status: :refused) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
it { expect(proposal_2.sent?).to be_truthy }
it { expect(lot_2.triage?).to be_truthy }
it { expect(proposal_3.triage?).to be_truthy }
it { expect(proposal_4.sent?).to be_truthy }
it { expect(proposal_4.sent?).to be_falsy }
end

context 'when return error' do
Expand Down

0 comments on commit d815dbe

Please sign in to comment.