From 786eba26cde8a1954dc4ed957d9b481c43441c44 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Fri, 16 May 2014 11:25:19 +0200 Subject: [PATCH] Bug 12271: add Bootstrap templates to valid-templates.t tests valid-templates.t actually tests the templates and includes of only the "prog" theme at opac and intranet. It does not test the opac templates and includes of bootstrap theme, nor ccsr. This is critical since this test is used for patch integrations in release maintenance. This patch adds the test of bootstrap opac theme. I did not manage to add the ccsr theme since it is not a real theme, meaning it has no templates and not all includes. Test by runnning perl xt/author/valid-templates.t and looking at the logs. Signed-off-by: Bernardo Gonzalez Kriegel Now there are 902 lines, bootstrap tested (1 error detected!) No koha-qa errors Signed-off-by: Galen Charlton (cherry picked from commit 8bc2fb4df6e14a97c3aa7a62fbacc4bc7cf5772d) Signed-off-by: Fridolin Somers --- xt/author/valid-templates.t | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/xt/author/valid-templates.t b/xt/author/valid-templates.t index 202ef579f0..c3d0490ec8 100644 --- a/xt/author/valid-templates.t +++ b/xt/author/valid-templates.t @@ -38,15 +38,38 @@ use Test::More; # use FindBin; # use IPC::Open3; -foreach my $type qw(intranet opac) { - my $template_dir = File::Spec->rel2abs("koha-tmpl/$type-tmpl/prog/en/modules"); - my $include_dir = File::Spec->rel2abs("koha-tmpl/$type-tmpl/prog/en/includes"); - my $template_test = create_template_test($include_dir); - find({ wanted => $template_test, no_chdir => 1 }, $template_dir, $include_dir); -} +print "Testing intranet prog templates\n"; +run_template_test( + 'koha-tmpl/intranet-tmpl/prog/en/modules', + 'koha-tmpl/intranet-tmpl/prog/en/includes' +); + +print "Testing opac bootstrap templates\n"; +run_template_test( + 'koha-tmpl/opac-tmpl/bootstrap/en/modules', + 'koha-tmpl/opac-tmpl/bootstrap/en/includes' +); + +print "Testing opac prog templates\n"; +run_template_test( + 'koha-tmpl/opac-tmpl/prog/en/modules', + 'koha-tmpl/opac-tmpl/prog/en/includes' +); + +# TODO add test of opac ccsr templates done_testing(); +sub run_template_test { + my $template_path = shift; + my $include_path = shift; + my $template_dir = File::Spec->rel2abs($template_path); + my $include_dir = File::Spec->rel2abs($include_path); + my $template_test = create_template_test($include_dir); + find( { wanted => $template_test, no_chdir => 1 }, + $template_dir, $include_dir ); +} + sub create_template_test { my $includes = shift; return sub { -- 2.39.2