diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/012throwables.t | 9 | ||||
| -rw-r--r-- | t/Support/Files.pm | 8 |
2 files changed, 16 insertions, 1 deletions
diff --git a/t/012throwables.t b/t/012throwables.t index 6cb2688ca..7600cbd02 100644 --- a/t/012throwables.t +++ b/t/012throwables.t @@ -47,6 +47,13 @@ foreach my $include_path (@include_paths) { $file =~ s|\\|/|g if ON_WINDOWS; # convert \ to / in path if on windows $test_templates{$file} = () if $file =~ m#global/(code|user)-error\.html\.tmpl#; + + # Make sure the extension is not disabled + if ($file =~ m#^(extensions/[^/]+/)#) { + $test_templates{$file} = () + if ! -e "${1}disabled" + && $file =~ m#global/(code|user)-error-errors\.html\.tmpl#; + } } } @@ -59,7 +66,7 @@ plan tests => $tests; # Collect all errors defined in templates foreach my $file (keys %test_templates) { - $file =~ m|template/([^/]+).*/global/([^/]+)-error\.html\.tmpl|; + $file =~ m|template/([^/]+).*/global/([^/]+)-error(?:-errors)?\.html\.tmpl|; my $lang = $1; my $errtype = $2; diff --git a/t/Support/Files.pm b/t/Support/Files.pm index 24b58c982..1a8e6ee37 100644 --- a/t/Support/Files.pm +++ b/t/Support/Files.pm @@ -16,6 +16,14 @@ use File::Find; find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, 'Bugzilla'); push(@files, 'extensions/create.pl'); +my @extensions = glob('extensions/*'); +foreach my $extension (@extensions) { + # Skip disabled extensions + next if -e "$extension/disabled"; + + find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, $extension); +} + sub isTestingFile { my ($file) = @_; my $exclude; |