Fix remaining tests

app/views/wiki/_form.html.haml

@@ -8,8 +8,8 @@
   %dt
     %label{:for =>'wiki_page_content'}
       Conteúdo
-      = markup_enabled_field
-  %dd= preserve(text_area('wiki_page', 'content'))
+      =markup_enabled_field
+  %dd=text_area('wiki_page', 'content')
     
   - unless @wiki_page.new_record?
     %dt

app/views/wiki/versions.html.haml

@@ -25,7 +25,7 @@
           %td.narrow
             %input{:type => "radio", :name => "to", :value => entry.version, :onclick => %"history_to(#{entry.version})"}
           %td= link_to(tz(entry.updated_at).strftime("%d/%m/%y %H:%M:%S"), course_wiki_instance_url(@course, @wiki_page, :version => entry.version))
-          %td= link_to truncate(h(User.find_with_deleted(entry.user_id).display_name), :length => 20), user_path(User.find_with_deleted(entry.user_id))
+          %td= link_to truncate(h(User.with_deleted.find(entry.user_id).display_name), :length => 20), user_path(User.with_deleted.find(entry.user_id))
           %td
             = entry.description
             - if (entry.version > @wiki_page.versions.minimum(:version))