Summary: | Fix Reserves.t | ||
---|---|---|---|
Product: | Koha | Reporter: | Marcel de Rooy <m.de.rooy> |
Component: | Hold requests | Assignee: | Marcel de Rooy <m.de.rooy> |
Status: | CLOSED FIXED | QA Contact: | Testopia <testopia> |
Severity: | minor | ||
Priority: | P5 - low | CC: | gmcharlt, gwilliams, tomascohen, veron |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
See Also: | http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14464 | ||
Change sponsored?: | --- | Patch complexity: | Trivial patch |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: | ||
Circulation function: | |||
Attachments: |
Bug 14801: Fix Reserves.t
[Signed-off] Bug 14801: Fix Reserves.t [PASSED QA] Bug 14801: Fix Reserves.t Bug 14801: Fix Reserves.t -- Follow-up for ChargeReserveFee Bug 14801: Fix Reserves.t Bug 14801: Fix Reserves.t -- Follow-up for ChargeReserveFee |
Description
Marcel de Rooy
2015-09-10 14:39:38 UTC
Created attachment 42475 [details] [review] Bug 14801: Fix Reserves.t Fix the following errors: not ok 59 - Bug 14464 - No fines at beginning ok 60 - Bug 14464 - 1st reserve correctly created not ok 61 - Bug 14464 - No fines after cancelling reserve with no charge configured ok 62 - Bug 14464 - 2nd reserve correctly created not ok 63 - Bug 14464 - No fines after cancelling reserve with no charge desired Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 42476 [details] [review] [Signed-off] Bug 14801: Fix Reserves.t Fix the following errors: not ok 59 - Bug 14464 - No fines at beginning ok 60 - Bug 14464 - 1st reserve correctly created not ok 61 - Bug 14464 - No fines after cancelling reserve with no charge configured ok 62 - Bug 14464 - 2nd reserve correctly created not ok 63 - Bug 14464 - No fines after cancelling reserve with no charge desired Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Marc Véron <veron@veron.ch> Created attachment 42500 [details] [review] [PASSED QA] Bug 14801: Fix Reserves.t Fix the following errors: not ok 59 - Bug 14464 - No fines at beginning ok 60 - Bug 14464 - 1st reserve correctly created not ok 61 - Bug 14464 - No fines after cancelling reserve with no charge configured ok 62 - Bug 14464 - 2nd reserve correctly created not ok 63 - Bug 14464 - No fines after cancelling reserve with no charge desired Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Still looking a little bit at this one. Will probably add a tiny follow-up. Created attachment 42506 [details] [review] Bug 14801: Fix Reserves.t -- Follow-up for ChargeReserveFee The problem making some tests fail, actually was the unneeded addition of zero accountline records by ChargeReserveFee, called by AddReserve. The balance is still zero, but a test like !$var responds differently when var is 0.00 instead of 0 or undef. This patch adjusts the test in ChargeReserveFee in order to prevent adding these records with 0.00. The first patch that adjusts the tests in Reserves.t is not strictly needed anymore, but can stay. Test plan: [1] Run t/db_dependent/Reserves.t [2] Run t/db_dependent/Reserves/GetReserveFee.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tomas: I added a followup that resolves the deeper cause of the failing test. It is fairly trivial :) But if you want another signoff or so, please change the status accordingly. Created attachment 42507 [details] [review] Bug 14801: Fix Reserves.t Fix the following errors: not ok 59 - Bug 14464 - No fines at beginning ok 60 - Bug 14464 - 1st reserve correctly created not ok 61 - Bug 14464 - No fines after cancelling reserve with no charge configured ok 62 - Bug 14464 - 2nd reserve correctly created not ok 63 - Bug 14464 - No fines after cancelling reserve with no charge desired Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Marc Veron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Amended the x==0 test with !x || x==0 to include 0.00 and prevent warn. Created attachment 42508 [details] [review] Bug 14801: Fix Reserves.t -- Follow-up for ChargeReserveFee The problem making some tests fail, actually was the unneeded addition of zero accountline records by ChargeReserveFee, called by AddReserve. The balance is still zero, but a test like !$var responds differently when var is 0.00 instead of 0 or undef. This patch adjusts the test in ChargeReserveFee in order to prevent adding these records with 0.00. The first patch that adjusts the tests in Reserves.t is not strictly needed anymore, but can stay. Test plan: [1] Run t/db_dependent/Reserves.t [2] Run t/db_dependent/Reserves/GetReserveFee.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Patches pushed to master. Thanks Marcel! |