From d274ca3888b1d099fc80ba135754df81243cee6e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 19 Jun 2013 19:38:43 +0300
Subject: [PATCH] Fix random failing tests with project teams

---
 app/views/team_members/_team_member.html.haml     |  2 +-
 features/steps/project/project_team_management.rb | 22 ++++------------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/app/views/team_members/_team_member.html.haml b/app/views/team_members/_team_member.html.haml
index 4bd4fca..63336bf 100644
--- a/app/views/team_members/_team_member.html.haml
+++ b/app/views/team_members/_team_member.html.haml
@@ -1,6 +1,6 @@
 - user = member.user
 - allow_admin = current_user_can_admin_project
-%li{id: dom_id(user), class: "team_member_row user_#{user.id}"}
+%li{id: dom_id(user), class: "team_member_row access-#{member.human_access.downcase}"}
   .pull-right
     - if allow_admin
       .pull-left
diff --git a/features/steps/project/project_team_management.rb b/features/steps/project/project_team_management.rb
index 7e9533d..af41fd4 100644
--- a/features/steps/project/project_team_management.rb
+++ b/features/steps/project/project_team_management.rb
@@ -30,35 +30,27 @@ class ProjectTeamManagement < Spinach::FeatureSteps
   end
 
   Then 'I should see "Mike" in team list as "Reporter"' do
-    user = User.find_by_name("Mike")
-
-    within "#user_#{user.id}" do
+    within ".access-reporter" do
       page.should have_content('Mike')
-      page.find('#team_member_project_access').value.should == access_value(:reporter)
     end
   end
 
   Given 'I should see "Sam" in team list as "Developer"' do
-    user = User.find_by_name("Sam")
-
-    within "#user_#{user.id}" do
+    within ".access-developer" do
       page.should have_content('Sam')
-      page.find('#team_member_project_access').value.should == access_value(:developer)
     end
   end
 
   And 'I change "Sam" role to "Reporter"' do
     user = User.find_by_name("Sam")
-    within ".user_#{user.id}" do
+    within "#user_#{user.id}" do
       select "Reporter", from: "team_member_project_access"
     end
   end
 
   And 'I should see "Sam" in team list as "Reporter"' do
-    user = User.find_by_name("Sam")
-    within ".user_#{user.id}" do
+    within ".access-reporter" do
       page.should have_content('Sam')
-      page.find('#team_member_project_access').value.should == access_value(:reporter)
     end
   end
 
@@ -111,10 +103,4 @@ class ProjectTeamManagement < Spinach::FeatureSteps
       click_link('Remove user from team')
     end
   end
-
-  private
-
-  def access_value(key)
-    UsersProject.roles_hash[key].to_s
-  end
 end
--
libgit2 0.21.2