[koha-commits] main Koha release repository branch master updated. v16.11.00-289-ge3a12e5

Fri Jan 20 14:54:03 CET 2017

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  e3a12e517a9039fa93b8b57e0adedbad5f0e9153 (commit)
       via  9510b023300cfdd3a560d06b0bdb5944d43d3d5c (commit)
       via  b5a95937e695dec4a7ecbff6f65d795af9ee029b (commit)
       via  4457d2e64c30f95fc79e306023e271ee7274b740 (commit)
       via  a7c2fc75054e81ca8909e05b6c2cfd6b9ba7293b (commit)
       via  b89be0d72fb24752bf5a2d939b15f90e6f23017d (commit)
       via  d4de65c21f4671b3fbbaf6d00904fe1753a8ae9a (commit)
      from  b732963e2f91a54894f12cd5fd964c21e1c6f533 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e3a12e517a9039fa93b8b57e0adedbad5f0e9153
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Jan 20 12:16:44 2017 +0100

    Bug 17909: QA followup: remove unused var and move global var

    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 9510b023300cfdd3a560d06b0bdb5944d43d3d5c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jan 20 11:29:30 2017 +0100

    Bug 17909: [Follow-up] Quick fix for UNIMARC

    UNIMARC inserts field 100. This interferes the field count and order
    in the test.
    Note: This is a quick fix. Will polish it after bug 17913.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit b5a95937e695dec4a7ecbff6f65d795af9ee029b
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Mon Jan 16 13:03:21 2017 +0000

    Bug 17909: Followup - fix typos

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    EDIT:

    Adjusted three small typos that did not disturb the test in its current
    form, but do when we are fixing bugs on bug 17913.

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 4457d2e64c30f95fc79e306023e271ee7274b740
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jan 16 12:15:56 2017 +0100

    Bug 17909: Additional polishing

    No spectacular things:

    [1] Move the framework modifications to a sub. Use same style to create auth types and linked fields.
    [2] Change some new Object occurrences to Object->new.
    [3] Add tests for field count and field order in the first two subsets.
    [4] Few whitespace changes (sorry) and comment lines.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit a7c2fc75054e81ca8909e05b6c2cfd6b9ba7293b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Jan 4 11:15:51 2017 +0100

    Bug 17909: Add tests for merging with another authtype

    Originally aimed for bug 9988. Adjusted in line with other subtests.
    Will polish the three subtests a little more on a follow-up.

    Test plan:
    Run t/db_dependent/Authorities/Merge.t

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit b89be0d72fb24752bf5a2d939b15f90e6f23017d
Author: mbeaulieu <mbeaulieu at inlibro.com>
Date:   Mon Aug 18 10:04:55 2014 -0400

    Bug 17909: Adding tests from bug 11315

    Based on original patch from Maxime Beaulieu on bug 11315.
    Amended by Marcel de Rooy on report 17909.

    EDIT:

    Original tests have been adjusted in view of:
    [1] Test on bug 11315 heavily leaned on DBD::Mock. Since we are
        using Test::DBIx::Class on such tests now, this would need attention.
        Moreover, the advantage of mocking the database in this case is at
        least arguable.
    [2] Matching the first (somewhat older) subtest of 11700.
    [3] Simplification and readability.
        Look e.g. at the use of $MARCto and $MARCfrom on 11315.

    This made me merge them in the db_dependent counterpart.

    Also note that this subtest adds another needed test case: the merge from
    auth1 to modified auth1, while 11700 tested auth1 to auth2.

    Test plan:
    Just run t/db_dependent/Authorities/Merge.t

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit d4de65c21f4671b3fbbaf6d00904fe1753a8ae9a
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Feb 19 11:31:13 2014 +0100

    Bug 17909: Add unit tests for C4::AuthoritiesMarc::merge

    Original patch from Julian Maurice on bug 11700.
    With sign offs by:
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Amended by Marcel de Rooy on report 17909.

    EDIT (January 2017):
    Removed some tests not related to merge.
    Put remaining tests in a subtest, made them working on current merge.
    Slightly revised the mocking.

    Note: I plan to move the zebra retrieval stuff outside merge in one of
    the next stages, and replace it by calling Koha::SearchEngine. This will
    reduce mocking complexity here.

    Test plan:
    Just run t/db_dependent/Authorities/Merge.t

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 t/db_dependent/Authorities/Merge.t |  288 ++++++++++++++++++++++++++++++++++++
 1 file changed, 288 insertions(+)
 create mode 100755 t/db_dependent/Authorities/Merge.t

hooks/post-receive
-- 
main Koha release repository