Commit 098673ad9e0388327e792ea408e547845e893994
1 parent
35475872
Exists in
api_visitor
fixed tests from merge errors
Showing
2 changed files
with
1 additions
and
2 deletions
Show diff stats
lib/noosfero/api/v1/people.rb
| ... | ... | @@ -87,7 +87,7 @@ module Noosfero |
| 87 | 87 | |
| 88 | 88 | desc "Return the person friends" |
| 89 | 89 | get ':id/friends' do |
| 90 | - person = environment.people.visible.find_by_id( id: params[:id]) | |
| 90 | + person = environment.people.visible.find_by(id: params[:id]) | |
| 91 | 91 | return not_found! if person.blank? |
| 92 | 92 | friends = person.friends.visible |
| 93 | 93 | present friends, :with => Entities::Person, :current_person => current_person | ... | ... |
test/api/people_test.rb
| ... | ... | @@ -118,7 +118,6 @@ class PeopleTest < ActiveSupport::TestCase |
| 118 | 118 | friend = fast_create(Person) |
| 119 | 119 | person.add_friend(friend) |
| 120 | 120 | friend.add_friend(person) |
| 121 | - | |
| 122 | 121 | get "/api/v1/people/#{friend.id}/friends?#{params.to_query}" |
| 123 | 122 | assert_includes json_response_ids(:people), person.id |
| 124 | 123 | end | ... | ... |