From 6b07c689cd814d5f8e9404ba685ad18877df04d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20G=C3=B6llner?= <timo.goellner@googlemail.com>
Date: Sun, 4 Aug 2013 15:15:05 +0200
Subject: [PATCH] fix search spec
search spec failed when using rails4
---
spec/components/search_spec.rb | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 06b4b8ef7c4..f1bdfbba484 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -17,6 +17,12 @@ describe Search do
nil
end
+ def result_ids_for_type(results, type)
+ results.find do |group|
+ group[:type] == type
+ end[:results].map {|r| r[:id]}
+ end
+
context 'post indexing observer' do
before do
@category = Fabricate(:category, name: 'america')
@@ -250,27 +256,30 @@ describe Search do
context 'search_context' do
context 'user as a search context' do
- let(:search_user) { Search.new('hello', search_context: post.user).execute }
let(:coding_horror) { Fabricate(:coding_horror) }
- let(:search_coding_horror) { Search.new('hello', search_context: coding_horror).execute }
Given!(:post) { Fabricate(:post) }
Given!(:coding_horror_post) { Fabricate(:post, user: coding_horror )}
+ When(:search_user) { Search.new('hello', search_context: post.user).execute }
- Then { first_of_type(search_user, 'topic')['id'] == post.topic_id }
- And { first_of_type(search_user, 'topic')['id'] == coding_horror_post.topic_id }
+ # should find topic created by searched user first
+ Then { first_of_type(search_user, 'topic')[:id].should == post.topic_id }
+ # results should also include topic by coding_horror
+ And { result_ids_for_type(search_user, 'topic').should include coding_horror_post.topic_id }
end
context 'category as a search context' do
let(:category) { Fabricate(:category) }
- let(:search_cat) { Search.new('hello', search_context: category).execute }
- let(:search_other_cat) { Search.new('hello', search_context: Fabricate(:category) ).execute }
let(:topic) { Fabricate(:topic, category: category) }
let(:topic_no_cat) { Fabricate(:topic) }
Given!(:post) { Fabricate(:post, topic: topic, user: topic.user ) }
- Then { first_of_type(search_cat, 'topic')['id'] == topic.id }
- Then { first_of_type(search_cat, 'topic')['id'] == topic_no_cat.id }
+ Given!(:another_post) { Fabricate(:post, topic: topic_no_cat, user: topic.user ) }
+ When(:search_cat) { Search.new('hello', search_context: category).execute }
+ # should find topic in searched category first
+ Then { first_of_type(search_cat, 'topic')[:id].should == topic.id }
+ # results should also include topic without category
+ And { result_ids_for_type(search_cat, 'topic').should include topic_no_cat.id }
end