Remove team_member show page -> use user_path instead

2 files changed, 10 insertions, 20 deletions

diff --git a/features/project/team_management.feature b/features/project/team_management.feature
index 0ac37620b4e..d106a543e80 100644
--- a/features/project/team_management.feature
+++ b/features/project/team_management.feature
@@ -23,13 +23,8 @@ Feature: Project Team management
     Then I visit project "Shop" team page
     And I should see "Sam" in team list as "Reporter"
 
-  Scenario: View team member profile
-    Given I click link "Sam"
-    Then I should see "Sam" team profile
-
   Scenario: Cancel team member
-    Given I click link "Sam"
-    And I click link "Remove from team"
+    Given I click cancel link for "Sam"
     Then I visit project "Shop" team page
     And I should not see "Sam" in team list
 
diff --git a/features/steps/project/project_team_management.rb b/features/steps/project/project_team_management.rb
index 435894134b0..fb7666bc994 100644
--- a/features/steps/project/project_team_management.rb
+++ b/features/steps/project/project_team_management.rb
@@ -5,13 +5,13 @@ class ProjectTeamManagement < Spinach::FeatureSteps
 
   Then 'I should be able to see myself in team' do
     page.should have_content(@user.name)
-    page.should have_content(@user.email)
+    page.should have_content(@user.username)
   end
 
   And '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.email)
+    page.should have_content(user.username)
   end
 
   Given 'I click link "New Team Member"' do
@@ -52,17 +52,6 @@ class ProjectTeamManagement < Spinach::FeatureSteps
     role_id.should == UsersProject.access_roles["Reporter"].to_s
   end
 
-  Given 'I click link "Sam"' do
-    first(:link, "Sam").click
-  end
-
-  Then 'I should see "Sam" team profile' do
-    user = User.find_by_name("Sam")
-    page.should have_content(user.name)
-    page.should have_content(user.email)
-    page.should have_content("To team list")
-  end
-
   And 'I click link "Remove from team"' do
     click_link "Remove from team"
   end
@@ -70,7 +59,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
   And '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.email)
+    page.should_not have_content(user.username)
   end
 
   And 'gitlab user "Mike"' do
@@ -106,4 +95,10 @@ class ProjectTeamManagement < Spinach::FeatureSteps
     select 'Website', from: 'source_project_id'
     click_button 'Import'
   end
+
+  step 'I click cancel link for "Sam"' do
+    within "#user_#{User.find_by_name('Sam').id}" do
+      click_link('Remove user from team')
+    end
+  end
 end