Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielgrippi <danielgrippi@gmail.com>2012-01-18 03:52:15 +0400
committerdanielgrippi <danielgrippi@gmail.com>2012-01-18 03:53:06 +0400
commit339c47d7821a577f901f509ba5976ae30434044d (patch)
tree2e2257c9842983312f094b47f5325d60c4f27557 /features
parentbfe0b7129c57e177e5b4767fc9d497638e788f11 (diff)
moved stream logic into its own controller (StreamsController)
Diffstat (limited to 'features')
-rw-r--r--features/oembed.feature1
-rw-r--r--features/photo_lightbox.feature1
-rw-r--r--features/posts_from_main_page.feature2
3 files changed, 3 insertions, 1 deletions
diff --git a/features/oembed.feature b/features/oembed.feature
index 6aefc2a18..9fdf31c9b 100644
--- a/features/oembed.feature
+++ b/features/oembed.feature
@@ -22,6 +22,7 @@ Feature: oembed
Given I expand the publisher
When I fill in "status_message_fake_text" with "http://mytube.com/watch?v=M3r2XDceM6A&format=json"
And I press "Share"
+ And I wait for the ajax to finish
And I follow "Your Aspects"
Then I should not see a video player
diff --git a/features/photo_lightbox.feature b/features/photo_lightbox.feature
index de908ec35..1b13de22d 100644
--- a/features/photo_lightbox.feature
+++ b/features/photo_lightbox.feature
@@ -12,7 +12,6 @@ Feature: viewing the photo lightbox
And I fill in "status_message_fake_text" with "Look at this dog"
And I press "Share"
And I wait for the ajax to finish
- And I am on the aspects page
Scenario: viewing a photo
Then I should see an image attached to the post
diff --git a/features/posts_from_main_page.feature b/features/posts_from_main_page.feature
index 251b782aa..fffe3073c 100644
--- a/features/posts_from_main_page.feature
+++ b/features/posts_from_main_page.feature
@@ -19,6 +19,8 @@ Feature: posting from the main page
Given I expand the publisher
When 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
+
And I go to the aspects page
Then I should see "I am eating a yogurt" within ".stream_element"