Skip to content
Extraits de code Groupes Projets
Valider 1ac688f8 rédigé par maxwell's avatar maxwell
Parcourir les fichiers

moved an ostatus builder query out to the controller, where it belongs, and corrected the order

parent 9d480b09
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -68,8 +68,9 @@ class UsersController < ApplicationController
user = User.find_by_username(params[:username])
if user
posts = Post.where(:author_id => user.person.id, :public => true).order('created_at DESC')
director = Diaspora::Director.new
ostatus_builder = Diaspora::OstatusBuilder.new(user)
ostatus_builder = Diaspora::OstatusBuilder.new(user, posts)
render :xml => director.build(ostatus_builder), :content_type => 'application/atom+xml'
else
......
......@@ -21,9 +21,9 @@ module Diaspora
class OstatusBuilder
include Diaspora::Webhooks
def initialize(user)
def initialize(user, posts)
@user = user
@posts = Post.where(:author_id => @user.person.id, :public => true)
@posts = posts
end
def create_headers
......
......@@ -22,11 +22,10 @@ describe Diaspora::OstatusBuilder do
arr << s
end
}
let!(:atom) { director = Diaspora::Director.new; director.build(Diaspora::OstatusBuilder.new(user)) }
let!(:atom) { director = Diaspora::Director.new; director.build(Diaspora::OstatusBuilder.new(user, public_status_messages)) }
it 'should include a users posts' do
public_status_messages.each{ |status| atom.should include status.message }
private_status_messages.each{ |status| atom.should_not include status.message }
end
end
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter