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:
authorRaphael Sofaer <raphael@joindiaspora.com>2011-07-05 02:38:15 +0400
committerRaphael Sofaer <raphael@joindiaspora.com>2011-07-05 02:38:15 +0400
commit7aefe37de84ee8b3d259b74ed8278b4315d00bda (patch)
tree0fb90503fc3120033da833bb14c8cdbdefc08677 /features
parente34809c8eda9c8d6398071ced4f719d47e30a72f (diff)
Reenable notifications feature, don't use javascript in step definitions if you can avoid it?
Diffstat (limited to 'features')
-rw-r--r--features/notifications.feature8
-rw-r--r--features/step_definitions/custom_web_steps.rb4
2 files changed, 6 insertions, 6 deletions
diff --git a/features/notifications.feature b/features/notifications.feature
index 0d8743961..ad63a9754 100644
--- a/features/notifications.feature
+++ b/features/notifications.feature
@@ -23,7 +23,7 @@ Background:
Then I should see "started sharing with you"
Scenario: notification popup
- #When I sign in as "alice@alice.alice"
- #And I click the notification badge
- #And I wait for the ajax to finish
- #Then the notification dropdown should be visible
+ When I sign in as "alice@alice.alice"
+ And I click the notification badge
+ And I wait for the ajax to finish
+ Then the notification dropdown should be visible
diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb
index 55f3ea3bb..135776487 100644
--- a/features/step_definitions/custom_web_steps.rb
+++ b/features/step_definitions/custom_web_steps.rb
@@ -188,9 +188,9 @@ When /^I wait for (\d+) seconds$/ do |seconds|
end
When /^I click the notification badge$/ do
- evaluate_script("$('#notification_badge a').click();");
+ find(:css, "#notification_badge a").click
end
Then /^the notification dropdown should be visible$/ do
- evaluate_script("$('#notification_dropdown').css('display') === 'block'")
+ find(:css, "#notification_dropdown").should be_visible
end