From 63924055093e92afc5b47395272fbf0ebe94312f Mon Sep 17 00:00:00 2001 From: Evandro Junior Date: Mon, 11 Apr 2016 15:30:20 -0300 Subject: [PATCH] fixed tests from merge errors --- lib/noosfero/api/v1/people.rb | 6 +----- test/api/people_test.rb | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/noosfero/api/v1/people.rb b/lib/noosfero/api/v1/people.rb index ecb4383..60e42d1 100644 --- a/lib/noosfero/api/v1/people.rb +++ b/lib/noosfero/api/v1/people.rb @@ -87,11 +87,7 @@ module Noosfero desc "Return the person friends" get ':id/friends' do -<<<<<<< HEAD - person = environment.people.visible_for_person(current_person).find_by id: params[:id] -======= - person = environment.people.visible.find_by_id(params[:id]) ->>>>>>> get list visible communities, enterprises & people + person = environment.people.visible.find_by(id: params[:id]) return not_found! if person.blank? friends = person.friends.visible present friends, :with => Entities::Person, :current_person => current_person diff --git a/test/api/people_test.rb b/test/api/people_test.rb index e10db7a..e3cade2 100644 --- a/test/api/people_test.rb +++ b/test/api/people_test.rb @@ -118,7 +118,6 @@ class PeopleTest < ActiveSupport::TestCase friend = fast_create(Person) person.add_friend(friend) friend.add_friend(person) - get "/api/v1/people/#{friend.id}/friends?#{params.to_query}" assert_includes json_response_ids(:people), person.id end -- libgit2 0.21.2