Improve User#posts_from

lib/diaspora/user/querying.rb

@@ -72,7 +72,7 @@ module Diaspora
       def posts_from(person)
         asp = Aspect.arel_table
         p = Post.arel_table
-        Post.joins(:aspects).where( p[:public].eq(true).or(asp[:user_id].eq(self.id))).order("updated_at DESC")
+        Post.includes(:aspects).where( p[:public].eq(true).or(asp[:user_id].eq(self.id))).order("posts.updated_at DESC")
       end
     end
   end

spec/controllers/people_controller_spec.rb

@@ -216,6 +216,7 @@ describe PeopleController do
       status_message = user2.post(:status_message, :message => "hey there", :to => 'all', :public => true)
 
       get :show, :id => user2.person.id
+      assigns[:posts].should include status_message
       response.body.should include status_message.message
     end
   end