Ticket #257: nocgiga.diff

templates/footer.tt

@@ -52 +52 @@
     </script>
 
     <script type="text/javascript">
-    var pageTracker = _gat._getTracker("[% CGI.escapeHTML( config.google_analytics_key  ) %]");
+    var pageTracker = _gat._getTracker("[% config.google_analytics_key %]");
     pageTracker._trackPageview();
     </script>
   [% END %]

t/48_google_analytics.t

@@ -10 +10 @@
     exit 0;
 }
 
-plan tests => 5;
+plan tests => 9;
 
 my ( $config, $guide, $wiki, $cookie, $output );
 
@@ -57 +57 @@
                               );
 like( $output, qr/ga.js/, "does show up if key is provided" );
 like( $output, qr/ThisIsNotAKey/, "...correct key" );
+# Make sure analytics stuff only shows up if we want it to on recent changes
+# recent changes doesnt use CGI. which we dont need anymore but we should test in case we change our mind again.
+
+$config->google_analytics_key( "" );
+$output = $guide->display_recent_changes( return_output => 1 );
+unlike( $output, qr/ga.js/, "...also if analytics key is blank" );
+
+$config->google_analytics_key( 0 );
+$output = $guide->display_recent_changes( return_output => 1 );
+unlike( $output, qr/ga.js/, "...also if analytics key is zero" );
+
+$config->google_analytics_key( "ThisIsNotAKey" );
+$output = $guide->display_recent_changes( return_output => 1 );
+like( $output, qr/ga.js/, "does show up if key is provided" );
+like( $output, qr/ThisIsNotAKey/, "...correct key" );