From 7ccc81b0a409551ea25a0edc2e914907717541a3 Mon Sep 17 00:00:00 2001 From: Dennis Collinson Date: Tue, 3 Jan 2012 16:18:16 -0800 Subject: [PATCH] fix conversations cuke --- app/views/conversations/index.haml | 20 +++++++++---------- .../step_definitions/conversations_steps.rb | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml index 552719238..44ace12c2 100644 --- a/app/views/conversations/index.haml +++ b/app/views/conversations/index.haml @@ -20,18 +20,18 @@ = t('.inbox') #conversation_inbox - - if @conversations.count > 0 - .stream.conversations + .stream.conversations + - if @conversations.count > 0 = render :partial => 'conversations/conversation', :collection => @conversations, :locals => {:authors => @authors, :unread_counts => @unread_counts} + - else + %br + %br + %br + %br + %div{:style => 'text-align:center;'} + %i + = t('.no_messages') = will_paginate @conversations - - else - %br - %br - %br - %br - %div{:style => 'text-align:center;'} - %i - = t('.no_messages') .span-15.prepend-9.last diff --git a/features/step_definitions/conversations_steps.rb b/features/step_definitions/conversations_steps.rb index 459bc26b2..d3b623cb4 100644 --- a/features/step_definitions/conversations_steps.rb +++ b/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)