From 667fb0f6b3fa8593558c61ef553e764fffa247ec Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Wed, 31 Oct 2012 17:07:03 -0400 Subject: [PATCH] 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. --- t/db_dependent/SuggestionEngine_ExplodedTerms.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/db_dependent/SuggestionEngine_ExplodedTerms.t b/t/db_dependent/SuggestionEngine_ExplodedTerms.t index 8726e74..b97166e 100755 --- a/t/db_dependent/SuggestionEngine_ExplodedTerms.t +++ b/t/db_dependent/SuggestionEngine_ExplodedTerms.t @@ -56,7 +56,7 @@ $langModule->mock('getTranslatedLanguages', sub { my $tmplModule = new Test::MockModule('C4::Templates'); $tmplModule->mock('_get_template_file', sub { my ($tmplbase, $interface, $query) = @_; - my $opactmpl = File::Spec->rel2abs(dirname(__FILE__) . '/../koha-tmpl/opac-tmpl'); + my $opactmpl = File::Spec->rel2abs(dirname(__FILE__) . '/../../koha-tmpl/opac-tmpl'); return ($opactmpl, 'prog', 'en', "$opactmpl/prog/en/modules/$tmplbase"); }); my $contextModule = new Test::MockModule('C4::Context'); -- 1.7.9.5