Attachment 67901 Details for Bug 15685 – Bug 15685: QA Followup

[patch] Bug 15685: QA Followup

Bug-15685-QA-Followup.patch (text/plain), 5.79 KB, created by Jonathan Druart on 2017-10-10 20:47:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-10-10 20:47:43 UTC

Size: 5.79 KB

patch

obsolete

>From 866e4ad2769142b6bb49f8cd0e4d97c6b2c20a37 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Fri, 7 Jul 2017 14:54:11 +0000
>Subject: [PATCH] Bug 15685: QA Followup
>
>DB revision fixes
>Unit tests
>
>Edit: fixed the update step description (tcohen)
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> installer/data/mysql/atomicupdate/bug15685.perl    | 11 +++++
> .../bug_15685-add_create_items_to_aqbasket.sql     |  1 -
> installer/data/mysql/kohastructure.sql             |  2 +-
> t/db_dependent/Koha/Acquisition/Basket.t           | 51 ++++++++++++++++++++++
> 4 files changed, 63 insertions(+), 2 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug15685.perl
> delete mode 100644 installer/data/mysql/atomicupdate/bug_15685-add_create_items_to_aqbasket.sql
> create mode 100644 t/db_dependent/Koha/Acquisition/Basket.t
>
>diff --git a/installer/data/mysql/atomicupdate/bug15685.perl b/installer/data/mysql/atomicupdate/bug15685.perl
>new file mode 100644
>index 0000000000..8c66878433
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug15685.perl
>@@ -0,0 +1,11 @@
>+$DBversion = 'XXX';  # will be replaced by the RM
>+if( CheckVersion( $DBversion ) ) {
>+
>+    $dbh->do(q{
>+        ALTER TABLE aqbasket
>+            ADD COLUMN create_items ENUM('ordering', 'receiving', 'cataloguing') default NULL
>+    });
>+
>+    SetVersion( $DBversion );
>+    print "Upgrade to $DBversion done (Bug 15685: Allow creation of items (AcqCreateItem) to be customizable per-basket)\n";
>+}
>diff --git a/installer/data/mysql/atomicupdate/bug_15685-add_create_items_to_aqbasket.sql b/installer/data/mysql/atomicupdate/bug_15685-add_create_items_to_aqbasket.sql
>deleted file mode 100644
>index 145e6d45b1..0000000000
>--- a/installer/data/mysql/atomicupdate/bug_15685-add_create_items_to_aqbasket.sql
>+++ /dev/null
>@@ -1 +0,0 @@
>-ALTER TABLE aqbasket ADD COLUMN create_items ENUM('ordering', 'receiving', 'cataloguing') DEFAULT NULL;
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 14c82e7af3..9b00860da2 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -2992,7 +2992,7 @@ CREATE TABLE `aqbasket` ( -- stores data about baskets in acquisitions
>   `basketgroupid` int(11), -- links this basket to its group (aqbasketgroups.id)
>   `deliveryplace` varchar(10) default NULL, -- basket delivery place
>   `billingplace` varchar(10) default NULL, -- basket billing place
>-  create_items ENUM('ordering', 'receiving', 'cataloguing') default NULL; -- when items should be created for orders in this basket
>+  create_items ENUM('ordering', 'receiving', 'cataloguing') default NULL, -- when items should be created for orders in this basket
>   branch varchar(10) default NULL, -- basket branch
>   is_standing TINYINT(1) NOT NULL DEFAULT 0, -- orders in this basket are standing
>   PRIMARY KEY  (`basketno`),
>diff --git a/t/db_dependent/Koha/Acquisition/Basket.t b/t/db_dependent/Koha/Acquisition/Basket.t
>new file mode 100644
>index 0000000000..0ba7367a98
>--- /dev/null
>+++ b/t/db_dependent/Koha/Acquisition/Basket.t
>@@ -0,0 +1,51 @@
>+#!/usr/bin/perl
>+
>+# Copyright 2017 Koha Development team
>+#
>+# This file is part of Koha
>+#
>+# Koha is free software; you can redistribute it and/or modify it
>+# under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 3 of the License, or
>+# (at your option) any later version.
>+#
>+# Koha is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with Koha; if not, see <http://www.gnu.org/licenses>.
>+
>+use Modern::Perl;
>+use Test::More tests => 8;
>+use Koha::Database;
>+use t::lib::TestBuilder;
>+use t::lib::Mocks;
>+use C4::Acquisition;
>+
>+use_ok('Koha::Acquisition::Basket');
>+use_ok('Koha::Acquisition::Baskets');
>+
>+my $schema = Koha::Database->schema;
>+$schema->storage->txn_begin;
>+my $dbh = C4::Context->dbh;
>+
>+# Start transaction
>+$dbh->{RaiseError} = 1;
>+
>+my $builder = t::lib::TestBuilder->new;
>+my $basket = $builder->build_object({ class => 'Koha::Acquisition::Baskets', value => { create_items => undef } });
>+my $created_basketno = C4::Acquisition::NewBasket($basket->booksellerid, $basket->authorisedby, $basket->basketname,$basket->note, $basket->booksellernote, $basket->contractnumber, $basket->deliveryplace, $basket->billingplace, $basket->is_standing, $basket->create_items);
>+my $created_basket = Koha::Acquisition::Baskets->find({ basketno => $created_basketno });
>+is($created_basket->basketno, $created_basketno, "Basket created by NewBasket matches db basket");
>+is( $basket->create_items, undef, "Create items value can be null");
>+t::lib::Mocks::mock_preference('AcqCreateItem', 'cataloguing');
>+is( $basket->effective_create_items, "cataloguing","We use AcqCreateItem if basket create items is not set");
>+C4::Acquisition::ModBasketHeader($basket->basketno, $basket->basketname, $basket->note, $basket->booksellernote, $basket->contractnumber, $basket->booksellerid, $basket->deliveryplace, $basket->billingplace, $basket->is_standing, "ordering");
>+my $retrieved_basket = Koha::Acquisition::Baskets->find({ basketno => $basket->basketno });
>+$basket->create_items("ordering");
>+is( $retrieved_basket->create_items, "ordering", "Should be able to set with ModBasketHeader");
>+is( $basket->create_items, "ordering", "Should be able to set with object methods");
>+is_deeply($retrieved_basket->unblessed, $basket->unblessed, "Correct basket found and updated");
>+is( $retrieved_basket->effective_create_items, "ordering","We use basket create items if it is set");
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 15685: 47783 | 55094 | 55096 | 57390 | 57392 | 57395 | 57424 | 57425 | 57426 | 57427 | 64918 | 64919 | 64920 | 64921 | 64922 | 65119 | 65120 | 65121 | 65122 | 65895 | 65896 | 65897 | 65898 | 65899 | 65900 | 66119 | 66120 | 66121 | 66122 | 66123 | 66124 | 67638 | 67639 | 67640 | 67641 | 67642 | 67643 | 67644 | 67645 | 67646 | 67647 | 67689 | 67690 | 67691 | 67692 | 67693 | 67694 | 67695 | 67696 | 67697 | 67698 | 67884 | 67898 | 67899 | 67900 | 67901 | 67902 | 67903 | 67904 | 67905 | 67906 | 67907 | 67908 | 67909 | 67910 | 67911