Merge pull request #4555 from consul/flaky_recount_spec

Fix flaky poll recount spec

spec/models/poll/partial_result_spec.rb

@@ -39,19 +39,23 @@
       expect(partial_result.officer_assignment_id_log).to eq("")
 
       partial_result.amount = 33
-      partial_result.officer_assignment = create(:poll_officer_assignment, id: 10)
+      first_assignment = create(:poll_officer_assignment)
+      partial_result.officer_assignment = first_assignment
       partial_result.save!
 
       partial_result.amount = 32
-      partial_result.officer_assignment = create(:poll_officer_assignment, id: 20)
+      second_assignment = create(:poll_officer_assignment)
+      partial_result.officer_assignment = second_assignment
       partial_result.save!
 
       partial_result.amount = 34
-      partial_result.officer_assignment = create(:poll_officer_assignment, id: 30)
+      partial_result.officer_assignment = create(:poll_officer_assignment)
       partial_result.save!
 
       expect(partial_result.amount_log).to eq(":33:32")
-      expect(partial_result.officer_assignment_id_log).to eq(":10:20")
+      expect(partial_result.officer_assignment_id_log).to eq(
+        ":#{first_assignment.id}:#{second_assignment.id}"
+      )
     end
 
     it "updates author_id if amount changes" do

spec/models/poll/recount_spec.rb

@@ -58,19 +58,23 @@
       expect(poll_recount.officer_assignment_id_log).to eq("")
 
       poll_recount.white_amount = 33
-      poll_recount.officer_assignment = create(:poll_officer_assignment, id: 101)
+      second_assignment = create(:poll_officer_assignment)
+      poll_recount.officer_assignment = second_assignment
       poll_recount.save!
 
       poll_recount.white_amount = 32
-      poll_recount.officer_assignment = create(:poll_officer_assignment, id: 102)
+      third_assignment = create(:poll_officer_assignment)
+      poll_recount.officer_assignment = third_assignment
       poll_recount.save!
 
       poll_recount.white_amount = 34
-      poll_recount.officer_assignment = create(:poll_officer_assignment, id: 103)
+      poll_recount.officer_assignment = create(:poll_officer_assignment)
       poll_recount.save!
 
       expect(poll_recount.white_amount_log).to eq(":0:33:32")
-      expect(poll_recount.officer_assignment_id_log).to eq(":#{officer_assignment.id}:101:102")
+      expect(poll_recount.officer_assignment_id_log).to eq(
+        ":#{officer_assignment.id}:#{second_assignment.id}:#{third_assignment.id}"
+      )
     end
 
     it "updates author_id if amount changes" do

spec/system/officing/voters_spec.rb

@@ -160,7 +160,7 @@
   end
 
   scenario "Store officer and booth information" do
-    create(:user, :in_census, id: rand(9999999))
+    create(:user, :in_census)
     poll1 = create(:poll, name: "¿Quieres que XYZ sea aprobado?")
     poll2 = create(:poll, name: "Pregunta de votación de prueba")