nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Strip leading/trailing whitespace from pod tags list in social relay well known

Browse source 
Closes #6303
This commit is contained in:
Jason Robinson 2015-08-09 00:33:35 +03:00
parent 480384a077
commit cb909c0d70
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/presenters/social_relay_presenter.rb
View file

@ -9,7 +9,7 @@ class SocialRelayPresenter
def tags def tags
return [] unless AppConfig.relay.inbound.scope == "tags" return [] unless AppConfig.relay.inbound.scope == "tags"
tags = AppConfig.relay.inbound.pod_tags.present? ? AppConfig.relay.inbound.pod_tags.split(",") : [] tags = AppConfig.relay.inbound.pod_tags.present? ? AppConfig.relay.inbound.pod_tags.split(",").map(&:strip) : []
add_user_tags(tags) add_user_tags(tags)
tags.uniq tags.uniq
end end

4
spec/presenters/social_relay_presenter_spec.rb
View file

@ -25,7 +25,7 @@ describe SocialRelayPresenter do
describe "pod tags" do describe "pod tags" do
before do before do
AppConfig.relay.inbound.pod_tags = "foo,bar" AppConfig.relay.inbound.pod_tags = "foo, bar"
AppConfig.relay.inbound.include_user_tags = false AppConfig.relay.inbound.include_user_tags = false
end end
@ -61,7 +61,7 @@ describe SocialRelayPresenter do
describe "pod tags combined with user tags" do describe "pod tags combined with user tags" do
before do before do
AppConfig.relay.inbound.pod_tags = "foo,bar" AppConfig.relay.inbound.pod_tags = "foo, bar"
AppConfig.relay.inbound.include_user_tags = true AppConfig.relay.inbound.include_user_tags = true
ceetag = FactoryGirl.create(:tag, name: "cee") ceetag = FactoryGirl.create(:tag, name: "cee")
lootag = FactoryGirl.create(:tag, name: "loo") lootag = FactoryGirl.create(:tag, name: "loo")