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, 6 insertions, 6 deletions

diff --git a/features/steps/admin/users.rb b/features/steps/admin/users.rb
index 289308bce1a..3422dc2b5af 100644
--- a/features/steps/admin/users.rb
+++ b/features/steps/admin/users.rb
@@ -3,32 +3,32 @@ class Spinach::Features::AdminUsers < Spinach::FeatureSteps
   include SharedPaths
   include SharedAdmin
 
-  Then 'I should see all users' do
+  step 'I should see all users' do
     User.all.each do |user|
       page.should have_content user.name
     end
   end
 
-  And 'Click edit' do
+  step 'Click edit' do
     @user = User.first
     find("#edit_user_#{@user.id}").click
   end
 
-  And 'Input non ascii char in username' do
+  step 'Input non ascii char in username' do
     fill_in 'user_username', with: "\u3042\u3044"
   end
 
-  And 'Click save' do
+  step 'Click save' do
     click_button("Save")
   end
 
-  Then 'See username error message' do
+  step 'See username error message' do
     within "#error_explanation" do
       page.should have_content "Username"
     end
   end
 
-  And 'Not changed form action url' do
+  step 'Not changed form action url' do
     page.should have_selector %(form[action="/admin/users/#{@user.username}"])
   end