Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/markdown_render.rb

1 files changed, 8 insertions, 8 deletions

diff --git a/features/steps/profile/emails.rb b/features/steps/profile/emails.rb
index e2eb35cbbe9..2b6ac37d866 100644
--- a/features/steps/profile/emails.rb
+++ b/features/steps/profile/emails.rb
@@ -1,47 +1,47 @@
 class Spinach::Features::ProfileEmails < Spinach::FeatureSteps
   include SharedAuthentication
 
-  Then 'I visit profile emails page' do
+  step 'I visit profile emails page' do
     visit profile_emails_path
   end
 
-  Then 'I should see my emails' do
+  step 'I should see my emails' do
     page.should have_content(@user.email)
     @user.emails.each do |email|
       page.should have_content(email.email)
     end
   end
 
-  And 'I submit new email "my@email.com"' do
+  step 'I submit new email "my@email.com"' do
     fill_in "email_email", with: "my@email.com"
     click_button "Add"
   end
 
-  Then 'I should see new email "my@email.com"' do
+  step 'I should see new email "my@email.com"' do
     email = @user.emails.find_by(email: "my@email.com")
     email.should_not be_nil
     page.should have_content("my@email.com")
   end
 
-  Then 'I should not see email "my@email.com"' do
+  step 'I should not see email "my@email.com"' do
     email = @user.emails.find_by(email: "my@email.com")
     email.should be_nil
     page.should_not have_content("my@email.com")
   end
   
-  Then 'I click link "Remove" for "my@email.com"' do
+  step 'I click link "Remove" for "my@email.com"' do
     # there should only be one remove button at this time
     click_link "Remove"
     # force these to reload as they have been cached
     @user.emails.reload
   end
 
-  And 'I submit duplicate email @user.email' do
+  step 'I submit duplicate email @user.email' do
     fill_in "email_email", with: @user.email
     click_button "Add"
   end
 
-  Then 'I should not have @user.email added' do
+  step 'I should not have @user.email added' do
     email = @user.emails.find_by(email: @user.email)
     email.should be_nil
   end