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

diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 324a44eaeec..83796b0ba88 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -7,97 +7,97 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
 
   # Sub Tabs: Home
 
-  Given 'I click the "Team" tab' do
+  step 'I click the "Team" tab' do
     click_link('Members')
   end
 
-  Given 'I click the "Attachments" tab' do
+  step 'I click the "Attachments" tab' do
     click_link('Attachments')
   end
 
-  Given 'I click the "Snippets" tab' do
+  step 'I click the "Snippets" tab' do
     click_link('Snippets')
   end
 
-  Given 'I click the "Edit" tab' do
+  step 'I click the "Edit" tab' do
     within '.project-settings-nav' do
       click_link('Project')
     end
   end
 
-  Given 'I click the "Hooks" tab' do
+  step 'I click the "Hooks" tab' do
     click_link('Web Hooks')
   end
 
-  Given 'I click the "Deploy Keys" tab' do
+  step 'I click the "Deploy Keys" tab' do
     click_link('Deploy Keys')
   end
 
-  Then 'the active sub nav should be Team' do
+  step 'the active sub nav should be Team' do
     ensure_active_sub_nav('Members')
   end
 
-  Then 'the active sub nav should be Edit' do
+  step 'the active sub nav should be Edit' do
     ensure_active_sub_nav('Project')
   end
 
-  Then 'the active sub nav should be Hooks' do
+  step 'the active sub nav should be Hooks' do
     ensure_active_sub_nav('Web Hooks')
   end
 
-  Then 'the active sub nav should be Deploy Keys' do
+  step 'the active sub nav should be Deploy Keys' do
     ensure_active_sub_nav('Deploy Keys')
   end
 
   # Sub Tabs: Commits
 
-  Given 'I click the "Compare" tab' do
+  step 'I click the "Compare" tab' do
     click_link('Compare')
   end
 
-  Given 'I click the "Branches" tab' do
+  step 'I click the "Branches" tab' do
     click_link('Branches')
   end
 
-  Given 'I click the "Tags" tab' do
+  step 'I click the "Tags" tab' do
     click_link('Tags')
   end
 
-  Then 'the active sub tab should be Commits' do
+  step 'the active sub tab should be Commits' do
     ensure_active_sub_tab('Commits')
   end
 
-  Then 'the active sub tab should be Compare' do
+  step 'the active sub tab should be Compare' do
     ensure_active_sub_tab('Compare')
   end
 
-  Then 'the active sub tab should be Branches' do
+  step 'the active sub tab should be Branches' do
     ensure_active_sub_tab('Branches')
   end
 
-  Then 'the active sub tab should be Tags' do
+  step 'the active sub tab should be Tags' do
     ensure_active_sub_tab('Tags')
   end
 
   # Sub Tabs: Issues
 
-  Given 'I click the "Milestones" tab' do
+  step 'I click the "Milestones" tab' do
     click_link('Milestones')
   end
 
-  Given 'I click the "Labels" tab' do
+  step 'I click the "Labels" tab' do
     click_link('Labels')
   end
 
-  Then 'the active sub tab should be Browse Issues' do
+  step 'the active sub tab should be Browse Issues' do
     ensure_active_sub_tab('Browse Issues')
   end
 
-  Then 'the active sub tab should be Milestones' do
+  step 'the active sub tab should be Milestones' do
     ensure_active_sub_tab('Milestones')
   end
 
-  Then 'the active sub tab should be Labels' do
+  step 'the active sub tab should be Labels' do
     ensure_active_sub_tab('Labels')
   end
 end