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

diff --git a/features/steps/shared/snippet.rb b/features/steps/shared/snippet.rb
index c64299ae6f3..5a27e8750cf 100644
--- a/features/steps/shared/snippet.rb
+++ b/features/steps/shared/snippet.rb
@@ -1,7 +1,7 @@
 module SharedSnippet
   include Spinach::DSL
 
-  And 'I have public "Personal snippet one" snippet' do
+  step 'I have public "Personal snippet one" snippet' do
     create(:personal_snippet,
            title: "Personal snippet one",
            content: "Test content",
@@ -10,7 +10,7 @@ module SharedSnippet
            author: current_user)
   end
 
-  And 'I have private "Personal snippet private" snippet' do
+  step 'I have private "Personal snippet private" snippet' do
     create(:personal_snippet,
            title: "Personal snippet private",
            content: "Provate content",
@@ -18,7 +18,7 @@ module SharedSnippet
            private: true,
            author: current_user)
   end
-  And 'I have a public many lined snippet' do
+  step 'I have a public many lined snippet' do
     create(:personal_snippet,
            title: 'Many lined snippet',
            content: <<-END.gsub(/^\s+\|/, ''),