From c1997ffca41787189fff3288a19453540fb6cce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Sun, 12 Feb 2017 15:57:20 +0100 Subject: [PATCH] changes poll recounts/results specs to respect foreign keys --- spec/models/poll/final_recount_spec.rb | 8 ++++---- spec/models/poll/null_result_spec.rb | 8 ++++---- spec/models/poll/partial_result_spec.rb | 8 ++++---- spec/models/poll/recount_spec.rb | 8 ++++---- spec/models/poll/white_result_spec.rb | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/spec/models/poll/final_recount_spec.rb b/spec/models/poll/final_recount_spec.rb index 7239056a5..bccd772ca 100644 --- a/spec/models/poll/final_recount_spec.rb +++ b/spec/models/poll/final_recount_spec.rb @@ -23,18 +23,18 @@ describe :final_recount do expect(final_recount.count_log).to eq("") final_recount.count = 33 - final_recount.officer_assignment_id = 1 + final_recount.officer_assignment = create(:poll_officer_assignment, id: 111) final_recount.save final_recount.count = 32 - final_recount.officer_assignment_id = 2 + final_recount.officer_assignment = create(:poll_officer_assignment, id: 112) final_recount.save final_recount.count = 34 - final_recount.officer_assignment_id = 3 + final_recount.officer_assignment = create(:poll_officer_assignment, id: 113) final_recount.save - expect(final_recount.officer_assignment_id_log).to eq(":1:2") + expect(final_recount.officer_assignment_id_log).to eq(":111:112") end end \ No newline at end of file diff --git a/spec/models/poll/null_result_spec.rb b/spec/models/poll/null_result_spec.rb index 9293027d1..746b48377 100644 --- a/spec/models/poll/null_result_spec.rb +++ b/spec/models/poll/null_result_spec.rb @@ -25,19 +25,19 @@ describe Poll::NullResult do expect(null_result.officer_assignment_id_log).to eq("") null_result.amount = 33 - null_result.officer_assignment_id = 1 + null_result.officer_assignment = create(:poll_officer_assignment, id: 101) null_result.save null_result.amount = 32 - null_result.officer_assignment_id = 2 + null_result.officer_assignment = create(:poll_officer_assignment, id: 102) null_result.save null_result.amount = 34 - null_result.officer_assignment_id = 3 + null_result.officer_assignment = create(:poll_officer_assignment, id: 103) null_result.save expect(null_result.amount_log).to eq(":33:32") - expect(null_result.officer_assignment_id_log).to eq(":1:2") + expect(null_result.officer_assignment_id_log).to eq(":101:102") end it "should update author_id if amount changes" do diff --git a/spec/models/poll/partial_result_spec.rb b/spec/models/poll/partial_result_spec.rb index 70651eda6..dd6176a06 100644 --- a/spec/models/poll/partial_result_spec.rb +++ b/spec/models/poll/partial_result_spec.rb @@ -36,19 +36,19 @@ describe Poll::PartialResult do expect(partial_result.officer_assignment_id_log).to eq("") partial_result.amount = 33 - partial_result.officer_assignment_id = 1 + partial_result.officer_assignment = create(:poll_officer_assignment, id: 10) partial_result.save partial_result.amount = 32 - partial_result.officer_assignment_id = 2 + partial_result.officer_assignment = create(:poll_officer_assignment, id: 20) partial_result.save partial_result.amount = 34 - partial_result.officer_assignment_id = 3 + partial_result.officer_assignment = create(:poll_officer_assignment, id: 30) partial_result.save expect(partial_result.amount_log).to eq(":33:32") - expect(partial_result.officer_assignment_id_log).to eq(":1:2") + expect(partial_result.officer_assignment_id_log).to eq(":10:20") end it "should update author_id if amount changes" do diff --git a/spec/models/poll/recount_spec.rb b/spec/models/poll/recount_spec.rb index 2d6bf5336..fb2c80704 100644 --- a/spec/models/poll/recount_spec.rb +++ b/spec/models/poll/recount_spec.rb @@ -23,18 +23,18 @@ describe :recount do expect(recount.count_log).to eq("") recount.count = 33 - recount.officer_assignment_id = 1 + recount.officer_assignment = create(:poll_officer_assignment, id: 11) recount.save recount.count = 32 - recount.officer_assignment_id = 2 + recount.officer_assignment = create(:poll_officer_assignment, id: 12) recount.save recount.count = 34 - recount.officer_assignment_id = 3 + recount.officer_assignment = create(:poll_officer_assignment, id: 13) recount.save - expect(recount.officer_assignment_id_log).to eq(":1:2") + expect(recount.officer_assignment_id_log).to eq(":11:12") end end \ No newline at end of file diff --git a/spec/models/poll/white_result_spec.rb b/spec/models/poll/white_result_spec.rb index 66a036cfe..687c4ebe1 100644 --- a/spec/models/poll/white_result_spec.rb +++ b/spec/models/poll/white_result_spec.rb @@ -25,19 +25,19 @@ describe Poll::WhiteResult do expect(white_result.officer_assignment_id_log).to eq("") white_result.amount = 33 - white_result.officer_assignment_id = 1 + white_result.officer_assignment = create(:poll_officer_assignment, id: 21) white_result.save white_result.amount = 32 - white_result.officer_assignment_id = 2 + white_result.officer_assignment = create(:poll_officer_assignment, id: 22) white_result.save white_result.amount = 34 - white_result.officer_assignment_id = 3 + white_result.officer_assignment = create(:poll_officer_assignment, id: 23) white_result.save expect(white_result.amount_log).to eq(":33:32") - expect(white_result.officer_assignment_id_log).to eq(":1:2") + expect(white_result.officer_assignment_id_log).to eq(":21:22") end it "should update author_id if amount changes" do