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

diff --git a/features/steps/snippets/user.rb b/features/steps/snippets/user.rb
index 9f58b5a1246..71a1952926f 100644
--- a/features/steps/snippets/user.rb
+++ b/features/steps/snippets/user.rb
@@ -3,33 +3,33 @@ class Spinach::Features::UserSnippets < Spinach::FeatureSteps
   include SharedPaths
   include SharedSnippet
 
-  Given 'I visit my snippets page' do
+  step 'I visit my snippets page' do
     visit user_snippets_path(current_user)
   end
 
-  Then 'I should see "Personal snippet one" in snippets' do
+  step 'I should see "Personal snippet one" in snippets' do
     page.should have_content "Personal snippet one"
   end
 
-  And 'I should see "Personal snippet private" in snippets' do
+  step 'I should see "Personal snippet private" in snippets' do
     page.should have_content "Personal snippet private"
   end
 
-  Then 'I should not see "Personal snippet one" in snippets' do
+  step 'I should not see "Personal snippet one" in snippets' do
     page.should_not have_content "Personal snippet one"
   end
 
-  And 'I should not see "Personal snippet private" in snippets' do
+  step 'I should not see "Personal snippet private" in snippets' do
     page.should_not have_content "Personal snippet private"
   end
 
-  Given 'I click "Public" filter' do
+  step 'I click "Public" filter' do
     within('.nav-stacked') do
       click_link "Public"
     end
   end
 
-  Given 'I click "Private" filter' do
+  step 'I click "Private" filter' do
     within('.nav-stacked') do
       click_link "Private"
     end