Download as
Browse Code »

Commit 63924055093e92afc5b47395272fbf0ebe94312f

Authored by Evandro Junior
Committed by Leandro Santos
1 parent 638d29b1
Exists in staging and in 31 other branches all_pending_tasks_api, api-articles-period, api_roles, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention

fixed tests from merge errors

Showing 2 changed files with 1 additions and 6 deletions   Show diff stats
lib/noosfero/api/v1/people.rb
  Diff comments   View file @6392405
@@ -87,11 +87,7 @@ module Noosfero @@ -87,11 +87,7 @@ module Noosfero
87 87
88 desc "Return the person friends" 88 desc "Return the person friends"
89 get ':id/friends' do 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 return not_found! if person.blank? 91 return not_found! if person.blank?
96 friends = person.friends.visible 92 friends = person.friends.visible
97 present friends, :with => Entities::Person, :current_person => current_person 93 present friends, :with => Entities::Person, :current_person => current_person
test/api/people_test.rb
  Diff comments   View file @6392405
@@ -118,7 +118,6 @@ class PeopleTest &lt; ActiveSupport::TestCase @@ -118,7 +118,6 @@ class PeopleTest &lt; ActiveSupport::TestCase
118 friend = fast_create(Person) 118 friend = fast_create(Person)
119 person.add_friend(friend) 119 person.add_friend(friend)
120 friend.add_friend(person) 120 friend.add_friend(person)
121 -  
122 get "/api/v1/people/#{friend.id}/friends?#{params.to_query}" 121 get "/api/v1/people/#{friend.id}/friends?#{params.to_query}"
123 assert_includes json_response_ids(:people), person.id 122 assert_includes json_response_ids(:people), person.id
124 end 123 end