Download as
Browse Code »

Commit 6dfd88a145b7c7f9dc798d888a2aa4ad5c1c54b7

Authored by Dmitriy Zaporozhets
2 parents 8fa47d00 85cecc0b
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'fix-group-members-search' into 'master' 

Fix group members search

Postgres only.
500 error when try to search group members on `/groups/:group_id/members` page
Showing 3 changed files with 15 additions and 1 deletions   Show diff stats
app/controllers/groups_controller.rb
  Diff comments   View file @6dfd88a
... ... @@ -68,7 +68,7 @@ class GroupsController < ApplicationController
68 68 @members = group.users_groups
69 69  
70 70 if params[:search].present?
71   - users = group.users.search(params[:search])
  71 + users = group.users.search(params[:search]).to_a
72 72 @members = @members.where(user_id: users)
73 73 end
74 74  
... ...
features/group.feature
  Diff comments   View file @6dfd88a
... ... @@ -113,3 +113,10 @@ Feature: Groups
113 113 Then I should see user "John Doe" in team list
114 114 Then I should see user "Mary Jane" in team list
115 115 Then I should not see the "Remove User From Group" button for "Mary Jane"
  116 +
  117 + Scenario: Search member by name
  118 + Given "Mary Jane" is guest of group "Guest"
  119 + And I visit group "Guest" members page
  120 + When I search for 'Mary' member
  121 + Then I should see user "Mary Jane" in team list
  122 + Then I should not see user "John Doe" in team list
... ...
features/steps/group/group.rb
  Diff comments   View file @6dfd88a
... ... @@ -157,6 +157,13 @@ class Groups < Spinach::FeatureSteps
157 157 # poltergeist always confirms popups.
158 158 end
159 159  
  160 + step 'I search for \'Mary\' member' do
  161 + within '.member-search-form' do
  162 + fill_in 'search', with: 'Mary'
  163 + click_button 'Search'
  164 + end
  165 + end
  166 +
160 167 protected
161 168  
162 169 def assigned_to_me key
... ...