X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=t%2Fdb_dependent%2FAcquisition%2FNewOrder.t;h=df455c2e6752de27dbbd200cb76c09d4cb1f5743;hb=f1f9c6dc746db9c58ce4eaca10ee9a4a7137c6f4;hp=b491075db1debd1c8cfea5491a839825f4e175f7;hpb=97d988b54fa4574faa93edf40940f5e700b5fe2f;p=koha-ffzg.git

diff --git a/t/db_dependent/Acquisition/NewOrder.t b/t/db_dependent/Acquisition/NewOrder.t
old mode 100644
new mode 100755
index b491075db1..df455c2e67
--- a/t/db_dependent/Acquisition/NewOrder.t
+++ b/t/db_dependent/Acquisition/NewOrder.t
@@ -2,38 +2,42 @@
 
 use Modern::Perl;
 
-use Test::More tests => 7;
+use Test::More tests => 8;
 use C4::Acquisition;
 use C4::Biblio;
-use C4::Bookseller;
 use C4::Budgets;
 use MARC::Record;
 use Koha::Database;
 use Koha::DateUtils qw( dt_from_string output_pref );
-use Koha::Acquisition::Order;
+use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
+use t::lib::TestBuilder;
+use t::lib::Mocks;
 
 my $schema = Koha::Database->new()->schema();
 $schema->storage->txn_begin();
-my $dbh = C4::Context->dbh;
-$dbh->{RaiseError} = 1;
 
-my $booksellerid = C4::Bookseller::AddBookseller(
+my $builder = t::lib::TestBuilder->new;
+my $logged_in_user = $builder->build_object({ class => 'Koha::Patrons' });
+t::lib::Mocks::mock_userenv({ patron => $logged_in_user });
+
+my $bookseller = Koha::Acquisition::Bookseller->new(
     {
         name => "my vendor",
         address1 => "bookseller's address",
         phone => "0123456",
         active => 1
     }
-);
+)->store;
 
 my $basketno = C4::Acquisition::NewBasket(
-    $booksellerid
+    $bookseller->id
 );
 
 my $budgetid = C4::Budgets::AddBudget(
     {
-        budget_code => "budget_code_test_getordersbybib",
-        budget_name => "budget_name_test_getordersbybib",
+        budget_code => "budget_code_test",
+        budget_name => "budget_name_test",
     }
 );
 
@@ -44,7 +48,7 @@ my ($biblionumber2, $biblioitemnumber2) = AddBiblio(MARC::Record->new, '');
 
 
 # returns undef and croaks if basketno, quantity, biblionumber or budget_id is missing
-my $order = eval { Koha::Acquisition::Order->new->insert };
+my $order = eval { Koha::Acquisition::Order->new->store };
 my $return_error = $@;
 ok(
     ( ! defined $order )
@@ -63,7 +67,7 @@ foreach my $mandatoryparams_key (@mandatoryparams_keys) {
     my %test_missing_mandatoryparams = %$mandatoryparams;
     delete $test_missing_mandatoryparams{$mandatoryparams_key};
     $order = eval {
-          Koha::Acquisition::Order->new( \%test_missing_mandatoryparams )->insert;
+          Koha::Acquisition::Order->new( \%test_missing_mandatoryparams )->store;
     };
     $return_error = $@;
     my $expected_error = "Cannot insert order: Mandatory parameter $mandatoryparams_key is missing";
@@ -81,10 +85,11 @@ $order = Koha::Acquisition::Order->new(
         biblionumber => $biblionumber1,
         budget_id => $budget->{budget_id},
     }
-)->insert;
-my $ordernumber = $order->{ordernumber};
-$order = Koha::Acquisition::Order->fetch({ ordernumber => $ordernumber });
-is( $order->{quantityreceived}, 0, 'Koha::Acquisition::Order->insert set quantityreceivedto 0 if undef is given' );
-is( $order->{entrydate}, output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), 'Koha::Acquisition::Order->insert set entrydate to today' );
+)->store;
+my $ordernumber = $order->ordernumber;
+$order = Koha::Acquisition::Orders->find( $ordernumber );
+is( $order->quantityreceived, 0, 'Koha::Acquisition::Order->insert set quantityreceivedto 0 if undef is given' );
+is( $order->entrydate, output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), 'Koha::Acquisition::Order->store set entrydate to today' );
+is( $order->created_by, $logged_in_user->borrowernumber, 'Koha::Acquisition::Order->store set created_by to logged in user if not given' );
 
-$schema->storage->txn_rollback();
\ No newline at end of file
+$schema->storage->txn_rollback();