From 0f654af1816bffc4bada443ac0b5fa1784e5a8e9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 25 Jul 2017 16:49:38 -0300 Subject: [PATCH] Bug 18982: Create a circ rule for the data we created No need to have a default circ cule, we create one for the categorycode and itemtype we are going to use. The 3 checkouts will not be rejected (5 are allowed) Signed-off-by: Jonathan Druart (cherry picked from commit 5b84987f28b43f0c92eeff9ed1067ed61f822a4b) Signed-off-by: Fridolin Somers --- t/db_dependent/selenium/basic_workflow.t | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/t/db_dependent/selenium/basic_workflow.t b/t/db_dependent/selenium/basic_workflow.t index e185b4df93..48a232ca65 100644 --- a/t/db_dependent/selenium/basic_workflow.t +++ b/t/db_dependent/selenium/basic_workflow.t @@ -62,7 +62,6 @@ our $sample_data = { userid => 'test_username', password => 'password', password2 => 'password' - }, itemtype => { itemtype => 'IT4TEST', @@ -70,6 +69,15 @@ our $sample_data = { rentalcharge => 0, notforloan => 0, }, + issuingrule => { + categorycode => 'test_cat', + itemtype => 'IT4test', + branchcode => '*', + maxissueqty => '5', + issuelength => '5', + lengthunit => 'days', + renewalperiod => '5', + }, }; our ( $borrowernumber, $start, $prev_time, $cleanup_needed ); @@ -136,6 +144,9 @@ SKIP: { my $itemtype = $sample_data->{itemtype}; $dbh->do(q|INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan) VALUES (?, ?, ?, ?)|, undef, $itemtype->{itemtype}, $itemtype->{description}, $itemtype->{rentalcharge}, $itemtype->{notforloan}); + my $issuing_rules = $sample_data->{issuingrule}; + $dbh->do(q|INSERT INTO issuingrules (categorycode, itemtype, branchcode, maxissueqty, issuelength, lengthunit, renewalperiod) VALUES (?, ?, ?, ?, ?, ?, ?)|, undef, $issuing_rules->{categorycode}, $issuing_rules->{itemtype}, $issuing_rules->{branchcode}, $issuing_rules->{maxissueqty}, $issuing_rules->{issuelength}, $issuing_rules->{lengthunit}, $issuing_rules->{renewalperiod}); + for my $biblionumber ( @biblionumbers ) { $driver->get($base_url."/cataloguing/additem.pl?biblionumber=$biblionumber"); like( $driver->get_title(), qr(test biblio \d+ by test author), ); @@ -223,6 +234,7 @@ sub cleanup { $dbh->do(qq|DELETE items, biblio FROM biblio INNER JOIN items ON biblio.biblionumber = items.biblionumber WHERE biblio.title = "test biblio$i"|); }; $dbh->do(q|DELETE FROM itemtypes WHERE itemtype=?|, undef, $sample_data->{itemtype}{itemtype}); + $dbh->do(q|DELETE FROM issuingrules WHERE categorycode=? AND itemtype=? AND branchcode=?|, undef, $sample_data->{issuingrule}{categorycode}, $sample_data->{issuingrule}{itemtype}, $sample_data->{issuingrule}{branchcode}); } sub time_diff { -- 2.39.5