From 78f4758d6dc2eb7438ee7efccec0bec4487d2590 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sun, 11 Dec 2011 15:08:43 -0800 Subject: [PATCH] Collapsing some cucumber features to save time. Removing features that should be tested elsewhere in the stack. --- features/closes_account.feature | 21 --------------------- features/conversations.feature | 4 ---- features/edits_profile.feature | 32 ++++++++------------------------ features/notifications.feature | 2 +- 4 files changed, 9 insertions(+), 50 deletions(-) diff --git a/features/closes_account.feature b/features/closes_account.feature index 11242455a..91b026dca 100644 --- a/features/closes_account.feature +++ b/features/closes_account.feature @@ -19,27 +19,6 @@ Feature: Close Account When I wait for the ajax to finish Then I should see "Your account is locked." - Scenario: user is forced to enter something in the password field on closing account - Given I am signed in - When I click on my name in the header - And I follow "Settings" - And I follow "Close Account" - And I preemptively confirm the alert - And I press "Close Account" in the modal window - Then I should be on the edit user page - And I should see "Please enter your current password to close your account." - - Scenario: user is forced to enter the right password in the password field on closing account - Given I am signed in - When I click on my name in the header - And I follow "Settings" - And I follow "Close Account" - And I preemptively confirm the alert - And I fill in "close_account_password" with "none sense" in the modal window - And I press "Close Account" in the modal window - Then I should be on the edit user page - And I should see "The entered password didn't match your current password." - Scenario: post display should not throw error when mention is removed for the user whose account is closed Given a user named "Bob Jones" with email "bob@bob.bob" And a user named "Alice Smith" with email "alice@alice.alice" diff --git a/features/conversations.feature b/features/conversations.feature index 7d8da195d..1ea9a316b 100644 --- a/features/conversations.feature +++ b/features/conversations.feature @@ -19,7 +19,3 @@ Feature: private messages When I sign in as "alice@alice.alice" And I reply with "hey, how you doing?" Then I should see "hey, how you doing?" within ".stream_container" - - Scenario: send an empty message - When I send a message with subject "Empty Greetings" and text " " to "Alice Awesome" - Then I should not see "Empty Greetings" within "#conversation_inbox" diff --git a/features/edits_profile.feature b/features/edits_profile.feature index 992caa997..482a46250 100644 --- a/features/edits_profile.feature +++ b/features/edits_profile.feature @@ -1,43 +1,27 @@ @javascript Feature: editing your profile - - Background: + Scenario: editing profile fields Given I am signed in And I click on my name in the header And I follow "Profile" And I follow "Edit my profile" Then I should be on my edit profile page - Scenario: editing gender with a textbox When I fill in "profile_gender" with "Fearless" + And I fill in "profile_first_name" with "Boba" + And I fill in "profile_last_name" with "Fett" + And I fill in "profile_bio" with "This is a bio" + And I select "1986" from "profile_date_year" + And I select "November" from "profile_date_month" + And I select "30" from "profile_date_day" + And I press "Update Profile" Then I should be on my edit profile page And I should see "Profile updated" And the "profile_gender" field should contain "Fearless" - - Scenario: editing name - When I fill in "profile_first_name" with "Boba" - And I fill in "profile_last_name" with "Fett" - And I press "Update Profile" - Then I should be on my edit profile page - And I should see "Profile updated" And the "profile_first_name" field should contain "Boba" And the "profile_last_name" field should contain "Fett" - - Scenario: edit bio - When I fill in "profile_bio" with "This is a bio" - And I press "Update Profile" - Then I should be on my edit profile page - And I should see "Profile updated" And I should see "This is a bio" - - Scenario: change birthday - When I select "1986" from "profile_date_year" - And I select "November" from "profile_date_month" - And I select "30" from "profile_date_day" - And I press "Update Profile" - Then I should be on my edit profile page - And I should see "Profile updated" And the "profile_date_year" field should be filled with "1986" And the "profile_date_month" field should be filled with "11" And the "profile_date_day" field should be filled with "30" diff --git a/features/notifications.feature b/features/notifications.feature index 67f364aac..6baee7729 100644 --- a/features/notifications.feature +++ b/features/notifications.feature @@ -80,7 +80,7 @@ Feature: Notifications Then I should see "commented on your post" And I should have 1 email delivery - Scenario: someone mentioned you on his post + Scenario: someone mentioned me in their post Given a user with email "bob@bob.bob" is connected with "alice@alice.alice" And Alice has a post mentioning Bob When I sign in as "bob@bob.bob"