fix conversations cuke

app/views/conversations/index.haml

@@ -20,10 +20,9 @@
       = t('.inbox')
 
   #conversation_inbox
-    - if @conversations.count > 0
     .stream.conversations
+      - if @conversations.count > 0
         = render :partial => 'conversations/conversation', :collection => @conversations, :locals => {:authors => @authors, :unread_counts => @unread_counts}
-      = will_paginate @conversations
       - else
         %br
         %br
@@ -32,6 +31,7 @@
         %div{:style => 'text-align:center;'}
           %i
             = t('.no_messages')
+      = will_paginate @conversations
 
 
 .span-15.prepend-9.last

features/step_definitions/conversations_steps.rb

@@ -8,7 +8,7 @@ Then /^I send a message with subject "([^"]*)" and text "([^"]*)" to "([^"]*)"$/
   step %(I am on the conversations page)
   step %(I follow "New Message")
   step %(I wait for the ajax to finish)
-  
+  step %(I fill in "contact_autocomplete" with "#{person}" in the modal window)
   step %(I press the first ".as-result-item" within ".as-results" in the modal window)
   step %(I fill in "conversation_subject" with "#{subject}" in the modal window)
   step %(I fill in "conversation_text" with "#{text}" in the modal window)