Download as
Browse Code »

Commit 2864aca48c11d4f50471b988d9f11fec7b8f825b

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

Fix admin:groups test

Showing 2 changed files with 6 additions and 3 deletions   Show diff stats
app/views/admin/groups/show.html.haml
  Diff comments   View file @2864aca
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 Users from #{@group.name} Group 83 Users from #{@group.name} Group
84 %small 84 %small
85 (#{@group.users_groups.count}) 85 (#{@group.users_groups.count})
86 - %ul.well-list 86 + %ul.well-list.group-users-list
87 - @group.users_groups.order('group_access DESC').each do |member| 87 - @group.users_groups.order('group_access DESC').each do |member|
88 - user = member.user 88 - user = member.user
89 %li{class: dom_class(user)} 89 %li{class: dom_class(user)}
features/steps/admin/admin_groups.rb
  Diff comments   View file @2864aca
@@ -43,13 +43,16 @@ class AdminGroups < Spinach::FeatureSteps @@ -43,13 +43,16 @@ class AdminGroups < Spinach::FeatureSteps
43 user = User.find_by_name("John") 43 user = User.find_by_name("John")
44 select2(user.id, from: "#user_ids", multiple: true) 44 select2(user.id, from: "#user_ids", multiple: true)
45 within "#new_team_member" do 45 within "#new_team_member" do
46 - select "Reporter", from: "project_access" 46 + select "Reporter", from: "group_access"
47 end 47 end
48 click_button "Add users into group" 48 click_button "Add users into group"
49 end 49 end
50 50
51 Then 'I should see "John" in team list in every project as "Reporter"' do 51 Then 'I should see "John" in team list in every project as "Reporter"' do
52 - user = User.find_by_name("John") 52 + within ".group-users-list" do
  53 + page.should have_content "John"
  54 + page.should have_content "Reporter"
  55 + end
53 end 56 end
54 57
55 protected 58 protected