diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/006spellcheck.t | 6 | ||||
| -rw-r--r-- | t/007util.t | 6 | ||||
| -rw-r--r-- | t/008filter.t | 40 | ||||
| -rw-r--r-- | t/009bugwords.t | 18 | ||||
| -rw-r--r-- | t/012throwables.t | 22 |
5 files changed, 46 insertions, 46 deletions
diff --git a/t/006spellcheck.t b/t/006spellcheck.t index 70181ef85..a7e7c6d72 100644 --- a/t/006spellcheck.t +++ b/t/006spellcheck.t @@ -75,9 +75,9 @@ foreach my $file (@testitems) { last; } } - + close (FILE); - + if ($found_word) { ok(0,"$file: found SPELLING ERROR $found_word --WARNING"); } else { @@ -86,6 +86,6 @@ foreach my $file (@testitems) { } else { ok(0,"could not open $file for spellcheck --WARNING"); } -} +} exit 0; diff --git a/t/007util.t b/t/007util.t index b8e9505d8..b6d23bc32 100644 --- a/t/007util.t +++ b/t/007util.t @@ -18,7 +18,7 @@ use Support::Files; use Test::More tests => 17; use DateTime; -BEGIN { +BEGIN { use_ok('Bugzilla'); use_ok('Bugzilla::Util'); } @@ -53,13 +53,13 @@ is(format_time("2002.11.24 00:05:56", "%Y-%m-%d %R %Z"), "2002-11-24 00:05 $tz", my %email_strings = ( 'somebody@somewhere.com' => 'somebody', 'Somebody <somebody@somewhere.com>' => 'Somebody <somebody>', - 'One Person <one@person.com>, Two Person <two@person.com>' + 'One Person <one@person.com>, Two Person <two@person.com>' => 'One Person <one>, Two Person <two>', 'This string contains somebody@somewhere.com and also this@that.com' => 'This string contains somebody and also this', ); foreach my $input (keys %email_strings) { - is(Bugzilla::Util::email_filter($input), $email_strings{$input}, + is(Bugzilla::Util::email_filter($input), $email_strings{$input}, "email_filter('$input')"); } diff --git a/t/008filter.t b/t/008filter.t index 443fb2b4f..d86e6c7a6 100644 --- a/t/008filter.t +++ b/t/008filter.t @@ -11,7 +11,7 @@ # This test scans all our templates for every directive. Having eliminated # those which cannot possibly cause XSS problems, it then checks the rest -# against the safe list stored in the filterexceptions.pl file. +# against the safe list stored in the filterexceptions.pl file. # Sample exploit code: '>"><script>alert('Oh dear...')</script> @@ -42,17 +42,17 @@ foreach my $path (@Support::Templates::include_paths) { chdir $topdir; # absolute path my @testitems = Support::Templates::find_actual_files($path); chdir $topdir; # absolute path - + next unless @testitems; - + # Some people require this, others don't. No-one knows why. chdir $path; # relative path - + # We load a %safe list of acceptable exceptions. if (-r "filterexceptions.pl") { do "filterexceptions.pl"; if (ON_WINDOWS) { - # filterexceptions.pl uses / separated paths, while + # filterexceptions.pl uses / separated paths, while # find_actual_files returns \ separated ones on Windows. # Here, we convert the filter exception hash to use \. foreach my $file (keys %safe) { @@ -65,16 +65,16 @@ foreach my $path (@Support::Templates::include_paths) { } } } - + # We preprocess the %safe hash of lists into a hash of hashes. This allows - # us to flag which members were not found, and report that as a warning, + # us to flag which members were not found, and report that as a warning, # thereby keeping the lists clean. foreach my $file (keys %safe) { if (ref $safe{$file} eq 'ARRAY') { my $list = $safe{$file}; $safe{$file} = {}; foreach my $directive (@$list) { - $safe{$file}{$directive} = 0; + $safe{$file}{$directive} = 0; } } } @@ -105,14 +105,14 @@ foreach my $path (@Support::Templates::include_paths) { if (!directive_ok($file, $directive)) { # This intentionally makes no effort to eliminate duplicates; to do - # so would merely make it more likely that the user would not + # so would merely make it more likely that the user would not # escape all instances when attempting to correct an error. push(@unfiltered, "$lineno:$directive"); } - } + } my $fullpath = File::Spec->catfile($path, $file); - + if (@unfiltered) { my $uflist = join("\n ", @unfiltered); ok(0, "($lang/$flavor) $fullpath has unfiltered directives:\n $uflist\n--ERROR"); @@ -121,12 +121,12 @@ foreach my $path (@Support::Templates::include_paths) { # Find any members of the exclusion list which were not found my @notfound; foreach my $directive (keys %{$safe{$file}}) { - push(@notfound, $directive) if ($safe{$file}{$directive} == 0); + push(@notfound, $directive) if ($safe{$file}{$directive} == 0); } if (@notfound) { my $nflist = join("\n ", @notfound); - ok(0, "($lang/$flavor) $fullpath - filterexceptions.pl has extra members:\n $nflist\n" . + ok(0, "($lang/$flavor) $fullpath - filterexceptions.pl has extra members:\n $nflist\n" . "--WARNING"); } else { @@ -141,7 +141,7 @@ sub directive_ok { my ($file, $directive) = @_; # Comments - return 1 if $directive =~ /^#/; + return 1 if $directive =~ /^#/; # Remove any leading/trailing whitespace. $directive =~ s/^\s*//; @@ -183,7 +183,7 @@ sub directive_ok { # Simple assignments return 1 if $directive =~ /^[\w\.\$\{\}]+\s+=\s+/; - # Conditional literals with either sort of quotes + # Conditional literals with either sort of quotes # There must be no $ in the string for it to be a literal return 1 if $directive =~ /^(["'])[^\$]*[^\\]\1/; return 1 if $directive =~ /^(["'])\1/; @@ -191,10 +191,10 @@ sub directive_ok { # Special values always used for numbers return 1 if $directive =~ /^[ijkn]$/; return 1 if $directive =~ /^count$/; - + # Params return 1 if $directive =~ /^Param\(/; - + # Hooks return 1 if $directive =~ /^Hook.process\(/; @@ -206,12 +206,12 @@ sub directive_ok { # Special Template Toolkit loop variable return 1 if $directive =~ /^loop\.(index|count)$/; - + # Branding terms return 1 if $directive =~ /^terms\./; - + # Things which are already filtered - # Note: If a single directive prints two things, and only one is + # Note: If a single directive prints two things, and only one is # filtered, we may not catch that case. return 1 if $directive =~ /FILTER\ (html|csv|js|base64|css_class_quote|ics| quoteUrls|time|uri|xml|lower|html_light| diff --git a/t/009bugwords.t b/t/009bugwords.t index 740cbf6aa..ebfd99507 100644 --- a/t/009bugwords.t +++ b/t/009bugwords.t @@ -9,9 +9,9 @@ #Bugzilla Test 9# ####bugwords##### -# Bugzilla has a mechanism for taking various words, including "bug", "bugs", +# Bugzilla has a mechanism for taking various words, including "bug", "bugs", # and "a bug" and automatically replacing them in the templates with the local -# terminology. It does this by using the 'terms' hash, so "bug" becomes +# terminology. It does this by using the 'terms' hash, so "bug" becomes # "[% terms.bug %]". This test makes sure the relevant words aren't used # bare. @@ -27,7 +27,7 @@ use Bugzilla::Util; use File::Spec; -use Test::More tests => ($Support::Templates::num_actual_files); +use Test::More tests => ($Support::Templates::num_actual_files); # Find all the templates my @testitems; @@ -38,10 +38,10 @@ for my $path (@Support::Templates::include_paths) { foreach my $file (@testitems) { my @errors; - + # Read the entire file into a string local $/; - open (FILE, "<$file") || die "Can't open $file: $!\n"; + open (FILE, "<$file") || die "Can't open $file: $!\n"; my $slurp = <FILE>; close (FILE); @@ -53,7 +53,7 @@ foreach my $file (@testitems) { my @lineno = ($` =~ m/\n/gs); my $lineno = scalar(@lineno) + 1; - + # "a bug", "bug", "bugs" if (grep /(a?[\s>]bugs?[\s.:;,<])/i, $text) { # Exclude variable assignment. @@ -63,14 +63,14 @@ foreach my $file (@testitems) { } } } - + if (scalar(@errors)) { ok(0, "$file contains invalid bare words (e.g. 'bug') --WARNING"); - + foreach my $error (@errors) { print "$error->[0]: $error->[1]\n"; } - } + } else { ok(1, "$file has no invalid barewords"); } diff --git a/t/012throwables.t b/t/012throwables.t index 4317c0e89..af7a27eb2 100644 --- a/t/012throwables.t +++ b/t/012throwables.t @@ -48,7 +48,7 @@ foreach my $include_path (@include_paths) { my $file = File::Spec->catfile($include_path, $path); $file =~ s/\s.*$//; # nuke everything after the first space $file =~ s|\\|/|g if ON_WINDOWS; # convert \ to / in path if on windows - $test_templates{$file} = () + $test_templates{$file} = () if $file =~ m#global/(code|user)-error(?:-errors)?\.html\.tmpl#; # Make sure the extension is not disabled @@ -77,14 +77,14 @@ foreach my $file (keys %test_templates) { Register(\%test_templates, $file, "could not open file --WARNING"); next; } - + my $lineno=0; while (my $line = <TMPL>) { $lineno++; if ($line =~ /\[%\s[A-Z]+\s*error\s*==\s*"(.+)"\s*%\]/) { my $errtag = $1; if ($errtag =~ /\s/) { - Register(\%test_templates, $file, + Register(\%test_templates, $file, "has an error definition \"$errtag\" at line $lineno with " . "space(s) embedded --ERROR"); } @@ -125,7 +125,7 @@ foreach my $file (keys %test_modules) { push @{$Errors{$errtype}{$errtag}{used_in}{$file}}, $lineno; } } - + close(TMPL); } @@ -148,7 +148,7 @@ foreach my $errtype (keys %Errors) { if (scalar @langs) { UsedIn($errtype, $errtag, join(', ',@langs)); } - + # Now check for tag usage in all DEFINED languages foreach my $lang (keys %{$Errors{$errtype}{$errtag}{defined_in}}) { if (!defined $Errors{$errtype}{$errtag}{used_in}) { @@ -162,7 +162,7 @@ foreach my $errtype (keys %Errors) { # And make sure that everything defined in WS_ERROR_CODE # is actually a valid error. foreach my $err_name (keys %{WS_ERROR_CODE()}) { - if (!defined $Errors{'code'}{$err_name} + if (!defined $Errors{'code'}{$err_name} && !defined $Errors{'user'}{$err_name}) { Register(\%test_modules, 'WS_ERROR_CODE', @@ -218,18 +218,18 @@ sub UsedIn { my ($errtype, $errtag, $lang) = @_; $lang = $lang || "any"; foreach my $file (keys %{$Errors{$errtype}{$errtag}{used_in}}) { - Register(\%test_modules, $file, - "$errtype error tag '$errtag' is used at line(s) (" - . join (',', @{$Errors{$errtype}{$errtag}{used_in}{$file}}) + Register(\%test_modules, $file, + "$errtype error tag '$errtag' is used at line(s) (" + . join (',', @{$Errors{$errtype}{$errtag}{used_in}{$file}}) . ") but not defined for language(s): $lang"); } } sub DefinedIn { my ($errtype, $errtag, $lang) = @_; foreach my $file (keys %{$Errors{$errtype}{$errtag}{defined_in}{$lang}}) { - Register(\%test_templates, $file, + Register(\%test_templates, $file, "$errtype error tag '$errtag' is defined at line(s) (" - . join (',', @{$Errors{$errtype}{$errtag}{defined_in}{$lang}{$file}}) + . join (',', @{$Errors{$errtype}{$errtag}{defined_in}{$lang}{$file}}) . ") but is not used anywhere", 1); } } |