Commit 63924055093e92afc5b47395272fbf0ebe94312f
Committed by
Leandro Santos
1 parent
638d29b1
Exists in
staging
and in
31 other branches
fixed tests from merge errors
Showing
2 changed files
with
1 additions
and
6 deletions
Show diff stats
lib/noosfero/api/v1/people.rb
... | ... | @@ -87,11 +87,7 @@ module Noosfero |
87 | 87 | |
88 | 88 | desc "Return the person friends" |
89 | 89 | get ':id/friends' do |
90 | -<<<<<<< HEAD | |
91 | - person = environment.people.visible_for_person(current_person).find_by id: params[:id] | |
92 | -======= | |
93 | - person = environment.people.visible.find_by_id(params[:id]) | |
94 | ->>>>>>> get list visible communities, enterprises & people | |
90 | + person = environment.people.visible.find_by(id: params[:id]) | |
95 | 91 | return not_found! if person.blank? |
96 | 92 | friends = person.friends.visible |
97 | 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 | ... | ... |