From b46200224e13251181554548efeffdebf7771cd3 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Mon, 17 Oct 2011 17:45:45 -0700
Subject: [PATCH] cukes are green again
---
features/mentions_from_profile_page.feature | 1 -
features/posts_from_main_page.feature | 1 +
features/step_definitions/aspects_steps.rb | 2 +-
features/step_definitions/session_steps.rb | 1 -
features/support/env.rb | 7 +++++++
5 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/features/mentions_from_profile_page.feature b/features/mentions_from_profile_page.feature
index a5b3c3885e..3aebae75ca 100644
--- a/features/mentions_from_profile_page.feature
+++ b/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"
diff --git a/features/posts_from_main_page.feature b/features/posts_from_main_page.feature
index 020ab169f8..2c63a0be0c 100644
--- a/features/posts_from_main_page.feature
+++ b/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
diff --git a/features/step_definitions/aspects_steps.rb b/features/step_definitions/aspects_steps.rb
index b5c8ffa16c..50cb39429d 100644
--- a/features/step_definitions/aspects_steps.rb
+++ b/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}
diff --git a/features/step_definitions/session_steps.rb b/features/step_definitions/session_steps.rb
index a58407d3ec..9d0e9dbe87 100644
--- a/features/step_definitions/session_steps.rb
+++ b/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|
diff --git a/features/support/env.rb b/features/support/env.rb
index b03c6cedf2..ce8b4ad848 100644
--- a/features/support/env.rb
+++ b/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
--
GitLab