[koha-commits] main Koha release repository branch new/bug_8846 created. v3.08.00-1147-gf352b05

[Git repo owner]

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, new/bug_8846 has been created
        at  f352b05610eacab3e3145f017b12b1586f7ae533 (commit)

- Log -----------------------------------------------------------------
commit f352b05610eacab3e3145f017b12b1586f7ae533
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Wed Oct 31 17:07:03 2012 -0400

    Bug 8846 conflict resolution: correct path
    
    The test was moved since the original patch was written, making the
    revised test fail. This patch corrects the mocked template patch so that
    the test will pass.
    
    To test:
    1) Before applying patch, run
       `prove t/db_dependent/SuggestionEngine_ExplodedTerms.t`
    2) Note that it fails.
    3) Apply patch.
    4) Run `prove t/db_dependent/SuggestionEngine_ExplodedTerms.t`
    5) Note that it passes.
    6) Celebrate.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit e2a702653d7d1db52e02c6f0e4f2e2850312b481
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Sat Sep 29 09:28:43 2012 -0400

    Bug 8846: Exploded Terms test sneakily uses database
    
    Even though there is no need for anything stored in the database for the
    test, C4::Templates requires the database and a koha-conf.xml. The
    solution is to mock all database- and koha-conf-using routines.
    
    To test:
    1) Stop MySQL
    2) Unset KOHA_CONF
    3) Run test
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

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


hooks/post-receive
-- 
main Koha release repository