From 008ed32e9ea69ad936a95b45c29428860a832b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sat, 28 Apr 2012 12:28:07 +0200
Subject: [PATCH] unambigousify community spotlight query in the multi stream,
fix #3196
---
lib/evil_query.rb | 2 +-
spec/lib/evil_query_spec.rb | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/lib/evil_query.rb b/lib/evil_query.rb
index 113890c3b4..0753b0e0c5 100644
--- a/lib/evil_query.rb
+++ b/lib/evil_query.rb
@@ -69,7 +69,7 @@ module EvilQuery
end
def community_spotlight_posts!
- Post.all_public.where(:author_id => fetch_ids!(Person.community_spotlight, 'id'))
+ Post.all_public.where(:author_id => fetch_ids!(Person.community_spotlight, 'people.id'))
end
def ids!(query)
diff --git a/spec/lib/evil_query_spec.rb b/spec/lib/evil_query_spec.rb
index 68cd111995..05446e7300 100644
--- a/spec/lib/evil_query_spec.rb
+++ b/spec/lib/evil_query_spec.rb
@@ -1,5 +1,14 @@
require 'spec_helper'
+describe EvilQuery::MultiStream do
+ let(:evil_query) { EvilQuery::MultiStream.new(alice, 'created_at', Time.now-1.week, true) }
+ describe 'community_spotlight_posts!' do
+ it 'does not raise an error' do
+ expect { evil_query.community_spotlight_posts! }.to_not raise_error
+ end
+ end
+end
+
describe EvilQuery::Participation do
before do
@status_message = Factory(:status_message, :author => bob.person)
@@ -58,4 +67,4 @@ describe EvilQuery::Participation do
posts.map(&:id).should == [@status_messageE.id, @photoC.id, @status_messageA.id, @status_messageB.id]
end
end
-end
\ No newline at end of file
+end
--
GitLab