From 5e13e5aeee72c8a50de119e2f7dc73ed095fda69 Mon Sep 17 00:00:00 2001 From: Scott Date: Sat, 24 Oct 2009 01:59:20 +0800 Subject: [PATCH] Added a failing test for "OR" conditions where the columns are all via associations --- spec/named_scopes/or_conditions_spec.rb | 3 ++- spec/spec_helper.rb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/named_scopes/or_conditions_spec.rb b/spec/named_scopes/or_conditions_spec.rb index 8b18a9c0..5b8f63d1 100644 --- a/spec/named_scopes/or_conditions_spec.rb +++ b/spec/named_scopes/or_conditions_spec.rb @@ -43,5 +43,6 @@ lambda { User.name_or_company_name_like("ben") }.should_not raise_error(Searchlogic::NamedScopes::OrConditions::NoConditionSpecifiedError) User.name_or_company_name_like("ben").proxy_options.should == {:joins => :company, :conditions => "(users.name LIKE '%ben%') OR (companies.name LIKE '%ben%')"} User.company_name_or_name_like("ben").proxy_options.should == {:joins => :company, :conditions => "(companies.name LIKE '%ben%') OR (users.name LIKE '%ben%')"} + User.company_name_or_company_description_like("ben").proxy_options.should == {:joins => :company, :conditions => "(companies.name LIKE '%ben%') OR (company.description LIKE '%ben%')"} end -end \ No newline at end of file +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 58b165d3..0805cd9a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -15,6 +15,7 @@ t.datetime :created_at t.datetime :updated_at t.string :name + t.string :description t.integer :users_count, :default => 0 end