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

diff --git a/features/steps/project/team_management.rb b/features/steps/project/team_management.rb
index a7375f7a132..7907f2a6fe3 100644
--- a/features/steps/project/team_management.rb
+++ b/features/steps/project/team_management.rb
@@ -4,22 +4,22 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
   include SharedPaths
   include Select2Helper
 
-  Then 'I should be able to see myself in team' do
+  step 'I should be able to see myself in team' do
     page.should have_content(@user.name)
     page.should have_content(@user.username)
   end
 
-  And 'I should see "Sam" in team list' do
+  step 'I should see "Sam" in team list' do
     user = User.find_by(name: "Sam")
     page.should have_content(user.name)
     page.should have_content(user.username)
   end
 
-  Given 'I click link "New Team Member"' do
+  step 'I click link "New Team Member"' do
     click_link "New project member"
   end
 
-  And 'I select "Mike" as "Reporter"' do
+  step 'I select "Mike" as "Reporter"' do
     user = User.find_by(name: "Mike")
 
     select2(user.id, from: "#user_ids", multiple: true)
@@ -29,67 +29,67 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
     click_button "Add users"
   end
 
-  Then 'I should see "Mike" in team list as "Reporter"' do
+  step 'I should see "Mike" in team list as "Reporter"' do
     within ".access-reporter" do
       page.should have_content('Mike')
     end
   end
 
-  Given 'I should see "Sam" in team list as "Developer"' do
+  step 'I should see "Sam" in team list as "Developer"' do
     within ".access-developer" do
       page.should have_content('Sam')
     end
   end
 
-  And 'I change "Sam" role to "Reporter"' do
+  step 'I change "Sam" role to "Reporter"' do
     user = User.find_by(name: "Sam")
     within "#user_#{user.id}" do
       select "Reporter", from: "project_member_access_level"
     end
   end
 
-  And 'I should see "Sam" in team list as "Reporter"' do
+  step 'I should see "Sam" in team list as "Reporter"' do
     within ".access-reporter" do
       page.should have_content('Sam')
     end
   end
 
-  And 'I click link "Remove from team"' do
+  step 'I click link "Remove from team"' do
     click_link "Remove from team"
   end
 
-  And 'I should not see "Sam" in team list' do
+  step 'I should not see "Sam" in team list' do
     user = User.find_by(name: "Sam")
     page.should_not have_content(user.name)
     page.should_not have_content(user.username)
   end
 
-  And 'gitlab user "Mike"' do
+  step 'gitlab user "Mike"' do
     create(:user, name: "Mike")
   end
 
-  And 'gitlab user "Sam"' do
+  step 'gitlab user "Sam"' do
     create(:user, name: "Sam")
   end
 
-  And '"Sam" is "Shop" developer' do
+  step '"Sam" is "Shop" developer' do
     user = User.find_by(name: "Sam")
     project = Project.find_by(name: "Shop")
     project.team << [user, :developer]
   end
 
-  Given 'I own project "Website"' do
+  step 'I own project "Website"' do
     @project = create(:empty_project, name: "Website", namespace: @user.namespace)
     @project.team << [@user, :master]
   end
 
-  And '"Mike" is "Website" reporter' do
+  step '"Mike" is "Website" reporter' do
     user = User.find_by(name: "Mike")
     project = Project.find_by(name: "Website")
     project.team << [user, :reporter]
   end
 
-  And 'I click link "Import team from another project"' do
+  step 'I click link "Import team from another project"' do
     click_link "Import members from another project"
   end