additional functional tests, some controller fixes

app/views/artists/index.html.erb

@@ -11,7 +11,7 @@
       </thead>
       <tbody>
         <% @artists.each do |artist| %>
-          <% content_tag(:tr, :id => "artist-#{artist.id}") do %>
+          <%= content_tag(:tr, :id => "artist-#{artist.id}") do %>
             <td>
               <%= link_to "P", posts_path(:tags => artist.name), :title => "Find posts for artist" %>
               <%= link_to "E", edit_artist_path(artist), :title => "Edit artist" %> 

app/views/bans/edit.html.erb

@@ -1,7 +1,7 @@
 <div class="bans">
   <div class="new">
     <h1>Edit Ban</h1>
-    <%= render "form", :locals => {:ban => @ban} %>
+    <%= render :partial => "form", :locals => {:ban => @ban} %>
   </div>
 </div>
 

app/views/bans/index.html.erb

@@ -12,7 +12,7 @@
       <tbody>
         <% @bans.each do |ban| %>
           <tr id="ban-<%= ban.id %>">
-            <td><%= ban.user_name %></td>
+            <td><%= ban.user.name %></td>
             <td><%= ban.expires_at %></td>
             <td><%= ban.reason %></td>
             <td>

app/views/bans/new.html.erb

@@ -1,7 +1,7 @@
 <div class="bans">
   <div class="new">
     <h1>New Ban</h1>
-    <%= render "form", :locals => {:ban => @ban} %>
+    <%= render :partial => "form", :locals => {:ban => @ban} %>
   </div>
 </div>
 

app/views/bans/show.html.erb

@@ -2,7 +2,7 @@
   <div class="show">
     <h1>Show Ban</h1>
     <ul>
-      <li><strong>User</strong>: <%= @ban.user_name %></li>
+      <li><strong>User</strong>: <%= @ban.user.name %></li>
       <li><strong>Expires</strong>: <%= @ban.expires_at %></li>
       <li><strong>Reason</strong>: <%= @ban.reason %></li>
     </ul>

app/views/comment_votes/create.js.erb

@@ -0,0 +1,3 @@
+<% if @error %>
+  alert(<%= escape_javascript(@error.to_s) %>);
+<% end %>

app/views/comment_votes/create.js.rjs

@@ -1,3 +0,0 @@
-if @error
-  page.alert(@error.to_s)
-end

app/views/comments/index.html.erb

@@ -5,7 +5,7 @@
         <div class="preview">
           <%= link_to(image_tag(post.preview_file_url), post_path(post)) %>
         </div>
-        <%= render "comments/partials/index/list", :locals => {:post => post, :comments => post.comments.recent.reverse, :show_header => true} %>
+        <%= render :partial => "comments/partials/index/list", :locals => {:post => post, :comments => post.comments.recent.reverse, :show_header => true} %>
         <div class="clearfix"></div>
       </div>
     <% end %>