<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -41,5 +41,6 @@ describe &quot;Or conditions&quot; do
   
   it &quot;should play nice with scopes on associations&quot; do
     lambda { User.name_or_company_name_like(&quot;ben&quot;) }.should_not raise_error(Searchlogic::NamedScopes::OrConditions::NoConditionSpecifiedError)
+    User.name_or_company_name_like(&quot;ben&quot;).proxy_options.should == {:joins =&gt; :company, :conditions =&gt; &quot;(users.name LIKE '%ben%') OR (companies.name LIKE '%ben%')&quot;}
   end
 end
\ No newline at end of file</diff>
      <filename>spec/named_scopes/or_conditions_spec.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e724d6d59ad96565069c35921b01fdd3bfd89038</id>
    </parent>
  </parents>
  <author>
    <name>laserlemon</name>
    <email>steve.richert@gmail.com</email>
  </author>
  <url>http://github.com/binarylogic/searchlogic/commit/6f487dff4c52a2653ab53a3570954062dc205106</url>
  <id>6f487dff4c52a2653ab53a3570954062dc205106</id>
  <committed-date>2009-10-20T10:53:20-07:00</committed-date>
  <authored-date>2009-10-01T11:40:54-07:00</authored-date>
  <message>Expanded upon the now-passing OR-join association scope test, to check for properly formed proxy_options.</message>
  <tree>e7cd0e6ae0ba849e236171e913eea976683f5398</tree>
  <committer>
    <name>Ben Johnson</name>
    <email>bjohnson@binarylogic.com</email>
  </committer>
</commit>
