From 0853986d05d0f13b2033727b975dc7b620aef3e5 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Mon, 15 Apr 2019 12:57:54 +0100
Subject: [PATCH] Bug 22618: (RMaint follow-up) Backport fix

Remove tests for bug 15774 not in 18.11.x series that somehow got
wrongly introduced by the above bug bug backport

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 t/db_dependent/Acquisition.t | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/t/db_dependent/Acquisition.t b/t/db_dependent/Acquisition.t
index 4211c0809f..9f0374f6a4 100755
--- a/t/db_dependent/Acquisition.t
+++ b/t/db_dependent/Acquisition.t
@@ -759,41 +759,6 @@ subtest 'ModReceiveOrder and subscription' => sub {
     is( $order->get_from_storage->order_internalnote, $first_note );
 };
 
-subtest 'GetHistory with additional fields' => sub {
-    plan tests => 3;
-    my $builder = t::lib::TestBuilder->new;
-    my $order_basket = $builder->build({ source => 'Aqbasket', value => { is_standing => 0 } });
-    my $orderinfo ={
-        basketno => $order_basket->{basketno},
-        rrp => 19.99,
-        replacementprice => undef,
-        quantity => 1,
-        quantityreceived => 0,
-        datereceived => undef,
-        datecancellationprinted => undef,
-    };
-    my $order =        $builder->build({ source => 'Aqorder', value => $orderinfo });
-    my $history = GetHistory(ordernumber => $order->{ordernumber});
-    is( scalar( @$history ), 1, 'GetHistory returns the one order');
-
-    my $additional_field = $builder->build({source => 'AdditionalField', value => {
-            tablename => 'aqbasket',
-            name => 'snakeoil',
-            authorised_value_category => "",
-        }
-    });
-    $history = GetHistory( ordernumber => $order->{ordernumber}, additional_fields => [{ id => $additional_field->{id}, value=>'delicious'}]);
-    is( scalar ( @$history ), 0, 'GetHistory returns no order for an unused additional field');
-    my $basket = Koha::Acquisition::Baskets->find({ basketno => $order_basket->{basketno} });
-    $basket->set_additional_fields([{
-        id => $additional_field->{id},
-        value => 'delicious',
-    }]);
-
-    $history = GetHistory( ordernumber => $order->{ordernumber}, additional_fields => [{ id => $additional_field->{id}, value=>'delicious'}]);
-    is( scalar( @$history ), 1, 'GetHistory returns the order when additional field is set');
-};
-
 subtest 'Tests for get_rounding_sql' => sub {
 
     plan tests => 2;
-- 
2.20.1