Fix test cases...

diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml
index de173c280e7560b8229113d4500ac9a89ff87a2d..d5a5f01e7cef0a36364f5e83efbfd1a3fa621dc2 100644 (file)
--- a/app/views/layouts/frontpage.rhtml
+++ b/app/views/layouts/frontpage.rhtml
@@ -24,7 +24,7 @@
       &nbsp;&nbsp;<%= link_to("sign up", :controller => "account", 
                                 :action => "signup")%>
     <% end -%>
-      &nbsp;&nbsp;<%= link_to ("help/about", :controller => "site", 
+      &nbsp;&nbsp;<%= link_to("help/about", :controller => "site", 
                                :action => 'about')%>
       </div>
          <a href="index.html"><h1>selectricity: voting machinery for the masses</h1></a>

diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml
index 74ad018564dbdd57ec8e894ac45d2eb54d99c84e..1542b84acb84a7cad262b9f88008466dd95b5733 100644 (file)
--- a/app/views/layouts/main.rhtml
+++ b/app/views/layouts/main.rhtml
@@ -6,7 +6,8 @@
     <%= stylesheet_link_tag "main", :media => "all" %>
     <%= stylesheet_link_tag *(@stylesheets) %>
     <%= stylesheet_link_tag "ie6hacks", :media => "all" if \
-          request.user_agent =~ /msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i %>
+      request.methods.include?(:user_agent) and \
+      request.user_agent =~ /msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i %>
     <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
   </head>