Download as
Browse Code »

Commit 67b82e90cf00b2ba6063e8203b4f449d890cf98d

Authored by Dmitriy Zaporozhets
1 parent ef2c8593
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix random failing test

Showing 3 changed files with 13 additions and 13 deletions   Show diff stats
app/views/team_members/_team.html.haml
  Diff comments   View file @67b82e9
1 1 - team.each do |access, members|
2   - .ui-box
  2 + - role = Project.access_options.key(access).pluralize
  3 + .ui-box{class: role.downcase}
3 4 %h5.title
4   - = Project.access_options.key(access).pluralize
5   - %small= members.size
  5 + = role
  6 + %span.light (#{members.size})
6 7 %ul.well-list
7 8 - members.sort_by(&:user_name).each do |team_member|
8 9 = render 'team_members/team_member', member: team_member
... ...
features/project/team_management.feature
  Diff comments   View file @67b82e9
... ... @@ -21,7 +21,6 @@ Feature: Project Team management
21 21 Scenario: Update user access
22 22 Given I should see "Sam" in team list as "Developer"
23 23 And I change "Sam" role to "Reporter"
24   - Then I visit project "Shop" team page
25 24 And I should see "Sam" in team list as "Reporter"
26 25  
27 26 Scenario: Cancel team member
... ...
features/steps/project/project_team_management.rb
  Diff comments   View file @67b82e9
... ... @@ -30,15 +30,15 @@ class ProjectTeamManagement < Spinach::FeatureSteps
30 30 end
31 31  
32 32 Then 'I should see "Mike" in team list as "Reporter"' do
33   - user = User.find_by_name("Mike")
34   - role_id = find(".user_#{user.id} #team_member_project_access").value
35   - role_id.should == UsersProject.access_roles["Reporter"].to_s
  33 + within '.reporters' do
  34 + page.should have_content('Mike')
  35 + end
36 36 end
37 37  
38 38 Given 'I should see "Sam" in team list as "Developer"' do
39   - user = User.find_by_name("Sam")
40   - role_id = find(".user_#{user.id} #team_member_project_access").value
41   - role_id.should == UsersProject.access_roles["Developer"].to_s
  39 + within '.developers' do
  40 + page.should have_content('Sam')
  41 + end
42 42 end
43 43  
44 44 And 'I change "Sam" role to "Reporter"' do
... ... @@ -49,9 +49,9 @@ class ProjectTeamManagement < Spinach::FeatureSteps
49 49 end
50 50  
51 51 And 'I should see "Sam" in team list as "Reporter"' do
52   - user = User.find_by_name("Sam")
53   - role_id = find(".user_#{user.id} #team_member_project_access").value
54   - role_id.should == UsersProject.access_roles["Reporter"].to_s
  52 + within '.reporters' do
  53 + page.should have_content('Sam')
  54 + end
55 55 end
56 56  
57 57 And 'I click link "Remove from team"' do
... ...