From 1f30fac936a3b0905e736dd86e559e33caf036ac Mon Sep 17 00:00:00 2001
From: David Lawrence <dlawrence@mozilla.com>
Date: Wed, 10 Aug 2011 18:26:03 -0400
Subject: Initial checkin of bmo/4.0 extensions. Still todo: port changes to
 core Bugzilla code

---
 t/001compile.t     | 5 +++++
 t/008filter.t      | 2 +-
 t/012throwables.t  | 4 ++--
 t/Support/Files.pm | 5 ++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 't')

diff --git a/t/001compile.t b/t/001compile.t
index 9e63da0b4..9c5b50e2d 100644
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -45,6 +45,11 @@ sub compile_file {
     # Bugzilla::Install::CPAN.)
     local @INC = @INC;
 
+    if ($file =~ /extensions/) {
+        skip "$file: extensions not tested",  1;
+        return;
+    }
+
     if ($file =~ s/\.pm$//) {
         $file =~ s{/}{::}g;
         use_ok($file);
diff --git a/t/008filter.t b/t/008filter.t
index e73d23835..f0e7a6429 100644
--- a/t/008filter.t
+++ b/t/008filter.t
@@ -224,7 +224,7 @@ sub directive_ok {
     return 1 if $directive =~ /FILTER\ (html|csv|js|base64|css_class_quote|ics|
                                         quoteUrls|time|uri|xml|lower|html_light|
                                         obsolete|inactive|closed|unitconvert|
-                                        txt|html_linebreak|none)\b/x;
+                                        txt|html_linebreak|none|json)\b/x;
 
     return 0;
 }
diff --git a/t/012throwables.t b/t/012throwables.t
index 3738ad524..590fb8aa5 100644
--- a/t/012throwables.t
+++ b/t/012throwables.t
@@ -62,7 +62,7 @@ foreach my $include_path (@include_paths) {
         $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} = () 
-            if $file =~ m#global/(code|user)-error\.html\.tmpl#;
+            if $file =~ m#global/(code|user)-error(?:-errors)?\.html\.tmpl#;
     }
 }
 
@@ -75,7 +75,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 6c6e0ee57..31a0058db 100644
--- a/t/Support/Files.pm
+++ b/t/Support/Files.pm
@@ -23,12 +23,15 @@
 
 package Support::Files;
 
+use Bugzilla;
+
 use File::Find;
 
 @additional_files = ();
 
 @files = glob('*');
-find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, 'Bugzilla');
+my @extension_paths = map { $_->package_dir } @{ Bugzilla->extensions };
+find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, 'Bugzilla', @extension_paths);
 push(@files, 'extensions/create.pl');
 
 sub isTestingFile {
-- 
cgit v1.2.3-24-g4f1b