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

Fix query in TagsController#show

Browse source
This commit is contained in:
Raphael Sofaer 2011-04-06 10:51:56 -07:00
parent 4c696603c6
commit fd0fa61d53
2 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/tags_controller.rb
View file

@ -40,9 +40,12 @@ class TagsController < ApplicationController
def show
if current_user
@posts = StatusMessage.joins(:aspects).where(:pending => false
).where(Aspect.arel_table[:user_id].eq(current_user.id).or(StatusMessage.arel_table[:public].eq(true))
).select('DISTINCT posts.*')
@posts = StatusMessage.joins(:contacts).where(:pending => false).where(
Contact.arel_table[:user_id].eq(current_user.id).or(
StatusMessage.arel_table[:public].eq(true).or(
StatusMessage.arel_table[:author_id].eq(current_user.person.id)
)
)).select('DISTINCT posts.*')
else
@posts = StatusMessage.where(:public => true, :pending => false)
end

40
spec/controllers/tags_controller_spec.rb
View file

@ -7,13 +7,9 @@ require 'spec_helper'
describe TagsController do
render_views
before do
@user = alice
end
describe '#index (search)' do
before do
sign_in :user, @user
sign_in :user, alice
bob.profile.tag_string = "#cats #diaspora #rad"
bob.profile.build_tags
bob.profile.save!
@ -45,10 +41,24 @@ describe TagsController do
context 'signed in' do
before do
sign_in :user, @user
sign_in :user, alice
end
it 'works' do
get :show, :name => 'testing'
it 'displays your own post' do
my_post = alice.post(:status_message, :text => "#what", :to => 'all')
get :show, :name => 'what'
assigns(:posts).should == [my_post]
response.status.should == 200
end
it "displays a friend's post" do
other_post = bob.post(:status_message, :text => "#hello", :to => 'all')
get :show, :name => 'hello'
assigns(:posts).should == [other_post]
response.status.should == 200
end
it 'displays a public post' do
other_post = eve.post(:status_message, :text => "#hello", :public => true, :to => 'all')
get :show, :name => 'hello'
assigns(:posts).should == [other_post]
response.status.should == 200
end
end
@ -56,22 +66,22 @@ describe TagsController do
context "not signed in" do
context "when there are people to display" do
before do
@user.profile.tag_string = "#whatevs"
@user.profile.build_tags
@user.profile.save!
alice.profile.tag_string = "#whatevs"
alice.profile.build_tags
alice.profile.save!
get :show, :name => "whatevs"
end
it "succeeds" do
response.should be_success
end
it "assigns the right set of people" do
assigns(:people).should == [@user.person]
assigns(:people).should == [alice.person]
end
end
context "when there are posts to display" do
before do
@post = @user.post(:status_message, :text => "#what", :public => true, :to => 'all')
@user.post(:status_message, :text => "#hello", :public => true, :to => 'all')
@post = alice.post(:status_message, :text => "#what", :public => true, :to => 'all')
alice.post(:status_message, :text => "#hello", :public => true, :to => 'all')
end
it "succeeds" do
get :show, :name => 'what'
@ -82,7 +92,7 @@ describe TagsController do
assigns[:posts].should == [@post]
end
it 'succeeds with comments' do
@user.comment('what WHAT!', :on => @post)
alice.comment('what WHAT!', :on => @post)
get :show, :name => 'what'
response.should be_success
end