From 35e6a9494644b066d327b5f344b5e1ceba26805c Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Tue, 19 Nov 2013 19:06:23 +0000 Subject: [PATCH] stoa-api: make communities return name and url --- plugins/stoa/lib/stoa_plugin/person_api.rb | 2 +- plugins/stoa/test/unit/person_api_test.rb | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/stoa/lib/stoa_plugin/person_api.rb b/plugins/stoa/lib/stoa_plugin/person_api.rb index ce0ba1f..773188a 100644 --- a/plugins/stoa/lib/stoa_plugin/person_api.rb +++ b/plugins/stoa/lib/stoa_plugin/person_api.rb @@ -31,6 +31,6 @@ class StoaPlugin::PersonApi < Noosfero::FieldsDecorator end def communities - object.communities.public.map {|community| {:id => community.id, :name => community.name}} + object.communities.public.map {|community| {:url => context.url_for(community.url), :name => community.name}} end end diff --git a/plugins/stoa/test/unit/person_api_test.rb b/plugins/stoa/test/unit/person_api_test.rb index 0407b42..76d14ef 100644 --- a/plugins/stoa/test/unit/person_api_test.rb +++ b/plugins/stoa/test/unit/person_api_test.rb @@ -107,7 +107,11 @@ class StoaPlugin::PersonApiTest < ActiveSupport::TestCase c3 = fast_create(Community) c1.add_member(person) c2.add_member(person) - communities = [{:id => c1.id, :name => c1.name}, {:id => c2.id, :name => c2.name}] + c1_homepage = 'c1.org' + c2_homepage = 'c2.org' + self.stubs(:url_for).with(c1.url).returns(c1_homepage) + self.stubs(:url_for).with(c2.url).returns(c2_homepage) + communities = [{:url => c1_homepage, :name => c1.name}, {:url => c2_homepage, :name => c2.name}] api = StoaPlugin::PersonApi.new(person, self) assert_equivalent communities, api.communities @@ -120,7 +124,11 @@ class StoaPlugin::PersonApiTest < ActiveSupport::TestCase c1.add_member(person) c2.add_member(person) c3.add_member(person) - communities = [{:id => c1.id, :name => c1.name}] + c1_homepage = 'c1.org' + c2_homepage = 'c2.org' + self.stubs(:url_for).with(c1.url).returns(c1_homepage) + self.stubs(:url_for).with(c2.url).returns(c2_homepage) + communities = [{:url => c1_homepage, :name => c1.name}] api = StoaPlugin::PersonApi.new(person, self) assert_equivalent communities, api.communities -- libgit2 0.21.2