Merge 2a3ca06 into 512bc05

spec/integration/associations_spec.rb

@@ -364,6 +364,11 @@
 
         model do
           belongs_to :parent
+          default_scope { where('parent_id IS NOT NULL') }
+          include PgSearch
+          pg_search_scope :search_parent, :associated_against => {
+            :parent => [:name],
+          }
         end
       end
 
@@ -377,6 +382,13 @@
 
         results.should include(included)
         results.should_not include(excluded)
+
+        included_child = Child.create!(:parent => included)
+        excluded_child = Child.create!
+        results = Child.includes(:parent).search_parent('bar.foo')
+
+        results.should include(included_child)
+        results.should_not include(excluded_child)
       end
     end
   end