Updating the Firebug handler's unit test so that it now passes.

Bug: 12674
pear · Dec 13, 2007 · fc88647 · fc88647
1 parent 81c7711
commit fc88647
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 24 deletions.
diff --git a/package.php b/package.php
@@ -7,10 +7,9 @@
 The Log framework provides an abstracted logging system. It supports logging to console, file, Firebug, syslog, SQL, Sqlite, mail, mcal, and window targets. It also provides composite and subject - observer mechanisms.
 EOT;
 
-$version = '1.9.12';
+$version = '1.9.13';
 $notes = <<<EOT
-- The Firebug handler no longer generates Javascript errors in IE. (Bug 12607)
-- The users guide has been updated with information on writing custom handlers.
+- The Firebug handler's unit test now passes. (Bug 12674)
 EOT;
 
 $package = new PEAR_PackageFileManager2();

diff --git a/package.xml b/package.xml
@@ -25,19 +25,18 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2007-12-11</date>
- <time>23:12:11</time>
+ <date>2007-12-12</date>
+ <time>22:04:46</time>
  <version>
-  <release>1.9.12</release>
+  <release>1.9.13</release>
   <api>1.0.0</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.php.net/license/3_01.txt">PHP License</license>
- <notes>- The Firebug handler no longer generates Javascript errors in IE. (Bug 12607)
-- The users guide has been updated with information on writing custom handlers.</notes>
+ <notes>- The Firebug handler&apos;s unit test now passes. (Bug 12674)</notes>
  <contents>
   <dir baseinstalldir="/" name="/">
    <dir name="docs">
@@ -129,6 +128,19 @@
  </dependencies>
  <phprelease />
  <changelog>
+  <release>
+   <version>
+    <release>1.9.13</release>
+    <api>1.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2007-12-12</date>
+   <license uri="http://www.php.net/license/3_01.txt">PHP License</license>
+   <notes>- The Firebug handler&apos;s unit test now passes. (Bug 12674)</notes>
+  </release>
   <release>
    <version>
     <release>1.9.12</release>

diff --git a/tests/firebug.phpt b/tests/firebug.phpt
@@ -34,27 +34,63 @@ $logger->log('Alert',     PEAR_LOG_ALERT);
 $logger->log('Emergency', PEAR_LOG_EMERG);
 --EXPECT--
 ** UNBUFFERED **
-<script type="text/javascript">console.debug("PHP [debug] Debug");</script>
-<script type="text/javascript">console.info("PHP [info] Info");</script>
-<script type="text/javascript">console.info("PHP [notice] Notice");</script>
-<script type="text/javascript">console.warn("PHP [warning] Warning");</script>
-<script type="text/javascript">console.error("PHP [error] Error");</script>
-<script type="text/javascript">console.error("PHP [critical] Critical");</script>
-<script type="text/javascript">console.error("PHP [alert] Alert");</script>
-<script type="text/javascript">console.error("PHP [emergency] Emergency");</script>
+<script type="text/javascript">
+if (('console' in window) || ('firebug' in console)) {
+  console.debug("PHP [debug] Debug");
+}
+</script>
+<script type="text/javascript">
+if (('console' in window) || ('firebug' in console)) {
+  console.info("PHP [info] Info");
+}
+</script>
+<script type="text/javascript">
+if (('console' in window) || ('firebug' in console)) {
+  console.info("PHP [notice] Notice");
+}
+</script>
+<script type="text/javascript">
+if (('console' in window) || ('firebug' in console)) {
+  console.warn("PHP [warning] Warning");
+}
+</script>
+<script type="text/javascript">
+if (('console' in window) || ('firebug' in console)) {
+  console.error("PHP [error] Error");
+}
+</script>
+<script type="text/javascript">
+if (('console' in window) || ('firebug' in console)) {
+  console.error("PHP [critical] Critical");
+}
+</script>
+<script type="text/javascript">
+if (('console' in window) || ('firebug' in console)) {
+  console.error("PHP [alert] Alert");
+}
+</script>
+<script type="text/javascript">
+if (('console' in window) || ('firebug' in console)) {
+  console.error("PHP [emergency] Emergency");
+}
+</script>
 
 ** START BUFFERING **
 <script type="text/javascript">
-console.debug("PHP [debug] Debug");
-console.info("PHP [info] Info");
-console.info("PHP [notice] Notice");
-console.warn("PHP [warning] Warning");
+if (('console' in window) || ('firebug' in console)) {
+  console.debug("PHP [debug] Debug");
+  console.info("PHP [info] Info");
+  console.info("PHP [notice] Notice");
+  console.warn("PHP [warning] Warning");
+}
 </script>
 ** FLUSHED **
 ** REST OF BUFFERED **
 <script type="text/javascript">
-console.error("PHP [error] Error");
-console.error("PHP [critical] Critical");
-console.error("PHP [alert] Alert");
-console.error("PHP [emergency] Emergency");
+if (('console' in window) || ('firebug' in console)) {
+  console.error("PHP [error] Error");
+  console.error("PHP [critical] Critical");
+  console.error("PHP [alert] Alert");
+  console.error("PHP [emergency] Emergency");
+}
 </script>