cukes are green again

features/mentions_from_profile_page.feature

@@ -27,7 +27,6 @@ Feature: mentioning a contact from their profile page
       And I press "Share" in the modal window
       And I wait for the ajax to finish
       When I am on the aspects page
-      And I wait for the ajax to finish
       And I follow "PostingTo" within "#aspect_nav"
       And I wait for the ajax to finish
       Then I should see "I am eating a yogurt"

features/posts_from_main_page.feature

@@ -26,6 +26,7 @@ Feature: posting from the main page
       When I select only "PostingTo" aspect
       And I expand the publisher
       And I fill in "status_message_fake_text" with "I am eating a yogurt"
+
       And I press "Share"
       And I wait for the ajax to finish
 

features/step_definitions/aspects_steps.rb

@@ -13,7 +13,7 @@ When /^I select only "([^"]*)" aspect$/ do |aspect_name|
   And %{I wait for the ajax to finish}
 
   within('#aspect_nav') do
-    click_link 'Select all' if has_link? 'Select all'
+    click_link 'Deselect all' if has_link? 'Deselect all'
   end
 
   And %{I wait for the ajax to finish}

features/step_definitions/session_steps.rb

@@ -25,7 +25,6 @@ When /^I sign in as "([^"]*)"$/ do |email|
   @me = User.find_by_email(email)
   @me.password ||= 'password'
   Given 'I am signed in'
-  And 'I wait for the ajax to finish'
 end
 
 When /^I sign in with password "([^"]*)"$/ do |password|

features/support/env.rb

@@ -77,6 +77,13 @@ module Resque
   end
 end
 
+# Patch aspect stream to not ajax in itself
+class Stream::Aspect
+  def ajax_stream?
+    false
+  end
+end
+
 Before('@localserver') do
   TestServerFixture.start_if_needed
   CapybaraSettings.instance.save