Bugzilla – Attachment 86143 Details for
Bug 20912
Rental fees based on time period
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20912: (QA follow-up) Fix number of tests and correct typos
Bug-20912-QA-follow-up-Fix-number-of-tests-and-cor.patch (text/plain), 5.66 KB, created by
Martin Renvoize (ashimema)
on 2019-03-06 12:55:08 UTC
(
hide
)
Description:
Bug 20912: (QA follow-up) Fix number of tests and correct typos
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2019-03-06 12:55:08 UTC
Size:
5.66 KB
patch
obsolete
>From 11bf2eb13a38fbe09e49bdc124521f5c68cc14b0 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Sun, 28 Oct 2018 17:06:33 +0000 >Subject: [PATCH] Bug 20912: (QA follow-up) Fix number of tests and correct > typos > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > t/db_dependent/Circulation.t | 14 +++++++------- > t/db_dependent/Koha/ItemTypes.t | 6 +++--- > 2 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t >index d9b6338947..6b5d14be99 100755 >--- a/t/db_dependent/Circulation.t >+++ b/t/db_dependent/Circulation.t >@@ -18,7 +18,7 @@ > use Modern::Perl; > use utf8; > >-use Test::More tests => 124; >+use Test::More tests => 125; > use Test::MockModule; > > use Data::Dumper; >@@ -3057,22 +3057,22 @@ subtest 'Koha::ItemType::calc_rental_charge_daily tests' => sub { > t::lib::Mocks::mock_preference('finesCalendar', 'ignoreCalendar'); > my $issue = AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from ); > my $accountline = Koha::Account::Lines->find({ itemnumber => $item->id }); >- is( $accountline->amount, '7.000000', "Daily rental charge calulated correctly with finesCalendar = ignoreCalendar" ); >+ is( $accountline->amount, '7.000000', "Daily rental charge calculated correctly with finesCalendar = ignoreCalendar" ); > $accountline->delete(); > AddRenewal( $patron->id, $item->id, $library->id, $dt_to_renew, $dt_to ); > $accountline = Koha::Account::Lines->find({ itemnumber => $item->id }); >- is( $accountline->amount, '6.000000', "Daily rental charge calulated correctly with finesCalendar = ignoreCalendar, for renewal" ); >+ is( $accountline->amount, '6.000000', "Daily rental charge calculated correctly with finesCalendar = ignoreCalendar, for renewal" ); > $accountline->delete(); > $issue->delete(); > > t::lib::Mocks::mock_preference('finesCalendar', 'noFinesWhenClosed'); > $issue = AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from ); > $accountline = Koha::Account::Lines->find({ itemnumber => $item->id }); >- is( $accountline->amount, '7.000000', "Daily rental charge calulated correctly with finesCalendar = noFinesWhenClosed" ); >+ is( $accountline->amount, '7.000000', "Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed" ); > $accountline->delete(); > AddRenewal( $patron->id, $item->id, $library->id, $dt_to_renew, $dt_to ); > $accountline = Koha::Account::Lines->find({ itemnumber => $item->id }); >- is( $accountline->amount, '6.000000', "Daily rental charge calulated correctly with finesCalendar = noFinesWhenClosed, for renewal" ); >+ is( $accountline->amount, '6.000000', "Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed, for renewal" ); > $accountline->delete(); > $issue->delete(); > >@@ -3084,11 +3084,11 @@ subtest 'Koha::ItemType::calc_rental_charge_daily tests' => sub { > ); > $issue = AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from ); > $accountline = Koha::Account::Lines->find({ itemnumber => $item->id }); >- is( $accountline->amount, '6.000000', "Daily rental charge calulated correctly with finesCalendar = noFinesWhenClosed and closed Wednesdays" ); >+ is( $accountline->amount, '6.000000', "Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed and closed Wednesdays" ); > $accountline->delete(); > AddRenewal( $patron->id, $item->id, $library->id, $dt_to_renew, $dt_to ); > $accountline = Koha::Account::Lines->find({ itemnumber => $item->id }); >- is( $accountline->amount, '5.000000', "Daily rental charge calulated correctly with finesCalendar = noFinesWhenClosed and closed Wednesdays, for renewal" ); >+ is( $accountline->amount, '5.000000', "Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed and closed Wednesdays, for renewal" ); > $accountline->delete(); > $issue->delete(); > >diff --git a/t/db_dependent/Koha/ItemTypes.t b/t/db_dependent/Koha/ItemTypes.t >index 34ab094c9f..21f870d205 100755 >--- a/t/db_dependent/Koha/ItemTypes.t >+++ b/t/db_dependent/Koha/ItemTypes.t >@@ -171,11 +171,11 @@ subtest 'Koha::ItemType::calc_rental_charge_daily tests' => sub { > > t::lib::Mocks::mock_preference('finesCalendar', 'ignoreCalendar'); > my $charge = $itemtype->calc_rental_charge_daily( { from => $dt_from, to => $dt_to } ); >- is( $charge, 7.00, "Daily rental charge calulated correctly with finesCalendar = ignoreCalendar" ); >+ is( $charge, 7.00, "Daily rental charge calculated correctly with finesCalendar = ignoreCalendar" ); > > t::lib::Mocks::mock_preference('finesCalendar', 'noFinesWhenClosed'); > $charge = $itemtype->calc_rental_charge_daily( { from => $dt_from, to => $dt_to } ); >- is( $charge, 7.00, "Daily rental charge calulated correctly with finesCalendar = noFinesWhenClosed" ); >+ is( $charge, 7.00, "Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed" ); > > my $calendar = C4::Calendar->new( branchcode => $library->id ); > $calendar->insert_week_day_holiday( >@@ -184,7 +184,7 @@ subtest 'Koha::ItemType::calc_rental_charge_daily tests' => sub { > description => 'Test holiday' > ); > $charge = $itemtype->calc_rental_charge_daily( { from => $dt_from, to => $dt_to } ); >- is( $charge, 6.00, "Daily rental charge calulated correctly with finesCalendar = noFinesWhenClosed and closed Wednesdays" ); >+ is( $charge, 6.00, "Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed and closed Wednesdays" ); > > }; > >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20912
:
76065
|
76066
|
76067
|
76068
|
76069
|
77302
|
77303
|
77304
|
81141
|
81142
|
81143
|
81450
|
81771
|
81772
|
81773
|
81774
|
81775
|
81778
|
82195
|
82196
|
84412
|
84413
|
84414
|
84415
|
84416
|
84417
|
84418
|
84419
|
84420
|
84570
|
84571
|
84572
|
84573
|
84574
|
84575
|
84576
|
84577
|
84578
|
84579
|
84580
|
84581
|
84582
|
84583
|
84584
|
84585
|
84610
|
84611
|
84612
|
84613
|
84614
|
84615
|
84616
|
84617
|
84618
|
84619
|
84620
|
84621
|
84622
|
84623
|
84624
|
84625
|
84707
|
84708
|
84709
|
84710
|
84711
|
84712
|
84713
|
84714
|
84715
|
84716
|
84717
|
84718
|
84719
|
84720
|
84721
|
84722
|
84723
|
84724
|
85291
|
85292
|
85293
|
85294
|
85295
|
85296
|
85297
|
85298
|
85299
|
85300
|
85301
|
85302
|
85303
|
85304
|
85305
|
85306
|
85307
|
85308
|
85316
|
85543
|
85544
|
85545
|
85546
|
85547
|
85548
|
85549
|
85550
|
85551
|
85552
|
85553
|
85554
|
85555
|
85556
|
85557
|
85558
|
85559
|
85560
|
85561
|
85628
|
85631
|
86140
|
86141
|
86142
|
86143
|
86144
|
86145
|
86146
|
86147
|
86148
|
86149
|
86151
|
86152
|
86153
|
86154
|
86155
|
86156
|
86157
|
86158
|
86159
|
86160
|
86244
|
86245
|
86246
|
86247
|
86248
|
86249
|
86250
|
86251
|
86252
|
86253
|
86254
|
86255
|
86256
|
86257
|
86258
|
86259
|
86260
|
86261
|
86262
|
86263
|
86264
|
86282
|
86283
|
86284
|
86285
|
86286
|
86287
|
86288
|
86289
|
86290
|
86291
|
86292
|
86293
|
86294
|
86295
|
86296
|
86297
|
86298
|
86299
|
86300
|
86301
|
86302
|
86306
|
86307
|
86308
|
86309
|
86310
|
86311
|
86312
|
86313
|
86314
|
86315
|
86316
|
86317
|
86318
|
86319
|
86320
|
86321
|
86322
|
86323
|
86324
|
86325
|
86326
|
86327
|
87363
|
87413
|
87703