projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 22048: Use set_password in tests
[koha.git]
/
t
/
db_dependent
/
Bookseller.t
diff --git
a/t/db_dependent/Bookseller.t
b/t/db_dependent/Bookseller.t
index
c602ff4
..
c6f4c7f
100644
(file)
--- a/
t/db_dependent/Bookseller.t
+++ b/
t/db_dependent/Bookseller.t
@@
-67,8
+67,8
@@
my $sample_supplier1 = {
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
- tax_rate
=> '1.0000',
- discount =>
'1.0000'
,
+ tax_rate => '1.0000',
+ discount =>
1.0000
,
notes => 'notes1',
deliverytime => undef
};
notes => 'notes1',
deliverytime => undef
};
@@
-87,8
+87,8
@@
my $sample_supplier2 = {
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
- tax_rate
=> '2.0000',
- discount =>
'2.0000'
,
+ tax_rate => '2.0000',
+ discount =>
2.0000
,
notes => 'notes2',
deliverytime => 2
};
notes => 'notes2',
deliverytime => 2
};
@@
-118,7
+118,7
@@
for my $bookseller ( @bookseller2 ) {
}
$sample_supplier2->{id} = $id_supplier2;
}
$sample_supplier2->{id} = $id_supplier2;
-is_deeply(
$bookseller2[0]
, $sample_supplier2,
+is_deeply(
cast_precision($bookseller2[0])
, $sample_supplier2,
"Koha::Acquisition::Booksellers->search returns the right informations about supplier $sample_supplier2->{name}" );
$supplier1 = Koha::Acquisition::Bookseller->new($sample_supplier1)->store;
"Koha::Acquisition::Booksellers->search returns the right informations about supplier $sample_supplier2->{name}" );
$supplier1 = Koha::Acquisition::Bookseller->new($sample_supplier1)->store;
@@
-126,6
+126,7
@@
$id_supplier1 = $supplier1->id;
my @booksellers = Koha::Acquisition::Booksellers->search();
for my $bookseller ( @booksellers ) {
$bookseller = field_filter( $bookseller->unblessed );
my @booksellers = Koha::Acquisition::Booksellers->search();
for my $bookseller ( @booksellers ) {
$bookseller = field_filter( $bookseller->unblessed );
+ $bookseller = cast_precision($bookseller);
}
$sample_supplier1->{id} = $id_supplier1;
}
$sample_supplier1->{id} = $id_supplier1;
@@
-150,7
+151,7
@@
is( $bookseller1fromid, undef,
"find returns undef if no id given" );
$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
$bookseller1fromid = field_filter($bookseller1fromid->unblessed);
"find returns undef if no id given" );
$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
$bookseller1fromid = field_filter($bookseller1fromid->unblessed);
-is_deeply(
$bookseller1fromid
, $sample_supplier1,
+is_deeply(
cast_precision($bookseller1fromid)
, $sample_supplier1,
"Get Supplier1 (find a bookseller by id)" );
$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
"Get Supplier1 (find a bookseller by id)" );
$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
@@
-189,9
+190,9
@@
is( $bookseller1fromid->subscriptions->count,
my $id_subscription1 = NewSubscription(
undef, 'BRANCH2', $id_supplier1, undef, $id_budget, $biblionumber,
my $id_subscription1 = NewSubscription(
undef, 'BRANCH2', $id_supplier1, undef, $id_budget, $biblionumber,
- '
01-01-2013
',undef, undef, undef, undef,
+ '
2013-01-01
',undef, undef, undef, undef,
undef, undef, undef, undef, undef, undef,
undef, undef, undef, undef, undef, undef,
- 1, "subscription notes",undef, '
01-01-2013
', undef, undef,
+ 1, "subscription notes",undef, '
2013-01-01
', undef, undef,
undef, 'CALL ABC', 0, "intnotes", 0,
undef, undef, 0, undef, '2013-11-30', 0
);
undef, 'CALL ABC', 0, "intnotes", 0,
undef, undef, 0, undef, '2013-11-30', 0
);
@@
-201,9
+202,9
@@
is($subscriptions[0]->{publicnotes}, 'subscription notes', 'subscription search
my $id_subscription2 = NewSubscription(
undef, 'BRANCH2', $id_supplier1, undef, $id_budget, $biblionumber,
my $id_subscription2 = NewSubscription(
undef, 'BRANCH2', $id_supplier1, undef, $id_budget, $biblionumber,
- '
01-01-2013
',undef, undef, undef, undef,
+ '
2013-01-01
',undef, undef, undef, undef,
undef, undef, undef, undef, undef, undef,
undef, undef, undef, undef, undef, undef,
- 1, "subscription notes",undef, '
01-01-2013
', undef, undef,
+ 1, "subscription notes",undef, '
2013-01-01
', undef, undef,
undef, 'CALL DEF', 0, "intnotes", 0,
undef, undef, 0, undef, '2013-07-31', 0
);
undef, 'CALL DEF', 0, "intnotes", 0,
undef, undef, 0, undef, '2013-07-31', 0
);
@@
-229,8
+230,8
@@
$sample_supplier2 = {
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
- tax_rate
=> '2.0000
',
- discount =>
'2.0000'
,
+ tax_rate
=> '2.0000
',
+ discount =>
2.0000
,
notes => 'notes2 modified',
deliverytime => 2,
};
notes => 'notes2 modified',
deliverytime => 2,
};
@@
-259,8
+260,8
@@
my $sample_supplier3 = {
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
- tax_rate
=> '3.0000',
- discount =>
'3.0000'
,
+ tax_rate => '3.0000',
+ discount =>
3.0000
,
notes => 'notes3',
deliverytime => 3
};
notes => 'notes3',
deliverytime => 3
};
@@
-279,8
+280,8
@@
my $sample_supplier4 = {
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
- tax_rate
=> '3.0000',
- discount =>
'3.0000'
,
+ tax_rate => '3.0000',
+ discount =>
3.0000
,
notes => 'notes3',
};
my $supplier3 = Koha::Acquisition::Bookseller->new($sample_supplier3)->store;
notes => 'notes3',
};
my $supplier3 = Koha::Acquisition::Bookseller->new($sample_supplier3)->store;
@@
-330,9
+331,9
@@
ModBasket($basket4info);
#Add 1 subscription
my $id_subscription3 = NewSubscription(
undef, "BRANCH1", $id_supplier1, undef, $id_budget, $biblionumber,
#Add 1 subscription
my $id_subscription3 = NewSubscription(
undef, "BRANCH1", $id_supplier1, undef, $id_budget, $biblionumber,
- '
01-01-2013
',undef, undef, undef, undef,
+ '
2013-01-01
',undef, undef, undef, undef,
undef, undef, undef, undef, undef, undef,
undef, undef, undef, undef, undef, undef,
- 1, "subscription notes",undef, '
01-01-2013
', undef, undef,
+ 1, "subscription notes",undef, '
2013-01-01
', undef, undef,
undef, undef, 0, "intnotes", 0,
undef, undef, 0, 'LOCA', '2013-12-31', 0
);
undef, undef, 0, "intnotes", 0,
undef, undef, 0, 'LOCA', '2013-12-31', 0
);
@@
-355,16
+356,16
@@
my $order1 = Koha::Acquisition::Order->new(
quantity => 24,
biblionumber => $biblionumber,
budget_id => $id_budget,
quantity => 24,
biblionumber => $biblionumber,
budget_id => $id_budget,
- entrydate => '
01-01-2013
',
+ entrydate => '
2013-01-01
',
currency => $curcode,
notes => "This is a note1",
currency => $curcode,
notes => "This is a note1",
- tax_rate
=> 0.0500,
+ tax_rate => 0.0500,
orderstatus => 1,
subscriptionid => $id_subscription1,
quantityreceived => 2,
rrp => 10,
ecost => 10,
orderstatus => 1,
subscriptionid => $id_subscription1,
quantityreceived => 2,
rrp => 10,
ecost => 10,
- datereceived => '
01-06-2013
'
+ datereceived => '
2013-06-01
'
}
)->store;
my $ordernumber1 = $order1->ordernumber;
}
)->store;
my $ordernumber1 = $order1->ordernumber;
@@
-375,10
+376,10
@@
my $order2 = Koha::Acquisition::Order->new(
quantity => 20,
biblionumber => $biblionumber,
budget_id => $id_budget,
quantity => 20,
biblionumber => $biblionumber,
budget_id => $id_budget,
- entrydate => '
01-01-2013
',
+ entrydate => '
2013-01-01
',
currency => $curcode,
notes => "This is a note2",
currency => $curcode,
notes => "This is a note2",
- tax_rate
=> 0.0500,
+ tax_rate => 0.0500,
orderstatus => 1,
subscriptionid => $id_subscription2,
rrp => 10,
orderstatus => 1,
subscriptionid => $id_subscription2,
rrp => 10,
@@
-393,10
+394,10
@@
my $order3 = Koha::Acquisition::Order->new(
quantity => 20,
biblionumber => $biblionumber,
budget_id => $id_budget,
quantity => 20,
biblionumber => $biblionumber,
budget_id => $id_budget,
- entrydate => '
02-02-2013
',
+ entrydate => '
2013-02-02
',
currency => $curcode,
notes => "This is a note3",
currency => $curcode,
notes => "This is a note3",
- tax_rate
=> 0.0500,
+ tax_rate => 0.0500,
orderstatus => 2,
subscriptionid => $id_subscription3,
rrp => 11,
orderstatus => 2,
subscriptionid => $id_subscription3,
rrp => 11,
@@
-411,10
+412,10
@@
my $order4 = Koha::Acquisition::Order->new(
quantity => 20,
biblionumber => $biblionumber,
budget_id => $id_budget,
quantity => 20,
biblionumber => $biblionumber,
budget_id => $id_budget,
- entrydate => '
02-02-2013
',
+ entrydate => '
2013-02-02
',
currency => $curcode,
notes => "This is a note3",
currency => $curcode,
notes => "This is a note3",
- tax_rate
=> 0.0500,
+ tax_rate => 0.0500,
orderstatus => 2,
subscriptionid => $id_subscription3,
rrp => 11,
orderstatus => 2,
subscriptionid => $id_subscription3,
rrp => 11,
@@
-638,9
+639,7
@@
ok( exists( $suppliers{$id_supplier1} ),
"Supplier1 has late orders and $daysago10==$daysago10 " )
;
"Supplier1 has late orders and $daysago10==$daysago10 " )
;
-C4::Context->_new_userenv('DUMMY SESSION');
-C4::Context->set_userenv(0,0,0,'firstname','surname', 'BRANCH1', 'Library 1', 0, '', '');
-my $userenv = C4::Context->userenv;
+t::lib::Mocks::mock_userenv({ flags => 0, branchcode => 'BRANCH1' });
my $module = Test::MockModule->new('C4::Auth');
$module->mock(
my $module = Test::MockModule->new('C4::Auth');
$module->mock(
@@
-671,7
+670,7
@@
is(
);
# don the cape and turn into Superlibrarian!
);
# don the cape and turn into Superlibrarian!
-
C4::Context->set_userenv(0,0,0,'firstname','surname', 'BRANCH1', 'Library 1', 1, '', ''
);
+
t::lib::Mocks::mock_userenv({ flags => 1, branchcode => 'BRANCH1' }
);
@subscriptions = SearchSubscriptions({expiration_date => '2013-12-31'});
is(
scalar(grep { !$_->{cannotdisplay} } @subscriptions ),
@subscriptions = SearchSubscriptions({expiration_date => '2013-12-31'});
is(
scalar(grep { !$_->{cannotdisplay} } @subscriptions ),
@@
-780,3
+779,14
@@
sub field_filter {
}
return $struct;
}
}
return $struct;
}
+
+# ensure numbers are actually tested as numbers to prevent
+# precision changes causing test failures (D8->D9 Upgrades)
+sub cast_precision {
+ my ($struct) = @_;
+ my @cast = ('discount');
+ for my $cast (@cast) {
+ $struct->{$cast} = $struct->{$cast}+0;
+ }
+ return $struct;
+}