Commit a523a365 authored by Simon Green's avatar Simon Green Committed by Byron Jones

Bug 615627: Make t/012throwables.t know about user errors defined in extensions

r=dkl, a=LpSolit
parent 0bbec9ea
......@@ -709,10 +709,12 @@ sub _check_short_desc {
my $invocant = shift;
my $value = $invocant->$original(@_);
if ($value !~ /example/i) {
# Uncomment this line to make Bugzilla throw an error every time
# Use this line to make Bugzilla throw an error every time
# you try to file a bug or update a bug without the word "example"
# in the summary.
#ThrowUserError('example_short_desc_invalid');
if (0) {
ThrowUserError('example_short_desc_invalid');
}
}
return $value;
}
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment