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/dashboard/with_archived_projects.rb b/features/steps/dashboard/with_archived_projects.rb
index 0217a2a1c1d..256629382a7 100644
--- a/features/steps/dashboard/with_archived_projects.rb
+++ b/features/steps/dashboard/with_archived_projects.rb
@@ -8,15 +8,15 @@ class Spinach::Features::DashboardWithArchivedProjects < Spinach::FeatureSteps
     project.update_attribute(:archived, true)
   end
 
-  Then 'I should see "Shop" project link' do
+  step 'I should see "Shop" project link' do
     page.should have_link "Shop"
   end
 
-  Then 'I should not see "Forum" project link' do
+  step 'I should not see "Forum" project link' do
     page.should_not have_link "Forum"
   end
 
-  Then 'I should see "Forum" project link' do
+  step 'I should see "Forum" project link' do
     page.should have_link "Forum"
   end
 end