Added small fixes and unit tests for all searchable models

Rafael Martins
1 parent ee116023
Showing 11 changed files with 254 additions and 30 deletions Show diff stats
app/models/article.rb
app/models/product.rb
app/models/textile_article.rb
app/models/tiny_mce_article.rb
test/unit/article_test.rb
test/unit/category_test.rb
test/unit/product_test.rb
test/unit/profile_test.rb
test/unit/search_helper_test.rb
test/unit/textile_article_test.rb
test/unit/tiny_mce_article_test.rb
@@ -55,7 +55,7 @@ class Article &lt; ActiveRecord::Base
   xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
   named_scope :in_category, lambda { |category|
-    {:include => 'categories', :conditions => { 'categories.id' => category.id }}
+    {:include => 'categories_including_virtual', :conditions => { 'categories.id' => category.id }}
   }
   named_scope :by_range, lambda { |range| {
@@ -599,6 +599,7 @@ class Article &lt; ActiveRecord::Base
   def self.f_type_proc(klass)
     klass.constantize.type_name
   end
+
   def self.f_profile_type_proc(klass)
     klass.constantize.type_name
   end
@@ -612,12 +613,15 @@ class Article &lt; ActiveRecord::Base
       self.class.name
     end
   end
+
   def f_profile_type
     self.profile.class.name
   end
+
   def f_published_at
     self.published_at
   end
+
   def f_category
     self.categories.collect(&:name)
   end
@@ -626,12 +630,15 @@ class Article &lt; ActiveRecord::Base
   def name_sortable # give a different name for solr
     name
   end
+
   def public
     self.public?
   end
+
   def category_filter
     categories_including_virtual_ids
   end
+
   public
   acts_as_faceted :fields => {
@@ -225,7 +225,7 @@ class Product &lt; ActiveRecord::Base
     end
   end
   def self.f_qualifier_proc(ids)
-    array = ids.split ' '
+    array = ids.split
     qualifier = Qualifier.find_by_id array[0]
     certifier = Certifier.find_by_id array[1]
     certifier ? [qualifier.name, _(' cert. ') + certifier.name] : qualifier.name
 class TextileArticle < TextArticle
-  def self.type_name
-    _('Article')
-  end
-
   def self.short_description
     _('Text article with Textile markup language')
   end
 class TinyMceArticle < TextArticle
-  def self.type_name
-    _('Article')
-  end
-
   def self.short_description
     _('Text article with visual editor.')
   end
@@ -157,7 +157,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     fifth = fast_create(TextArticle, :profile_id => profile.id, :name => 'fifth')
     other_first = other_profile.articles.build(:name => 'first'); other_first.save!
-    
+
     assert_equal [other_first, fifth, fourth], Article.recent(3)
     assert_equal [other_first, fifth, fourth, third, second, first], Article.recent(6)
   end
@@ -290,7 +290,9 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'associate with categories' do
     env = Environment.default
-    c1 = env.categories.build(:name => "test category 1"); c1.save!
+    parent_cat = env.categories.build(:name => "parent category")
+    parent_cat.save!
+    c1 = env.categories.build(:name => "test category 1", :parent_id => parent_cat.id); c1.save!
     c2 = env.categories.build(:name => "test category 2"); c2.save!
     article = profile.articles.build(:name => 'withcategories')
@@ -300,6 +302,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     article.add_category c2
     assert_equivalent [c1,c2], article.categories(true)
+    assert_equivalent [c1, parent_cat, c2], article.categories_including_virtual(true)
   end
   should 'remove comments when removing article' do
@@ -408,6 +411,9 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_includes c3.articles(true), art
     assert_includes c2.articles(true), art
     assert_includes c1.articles(true), art
+
+		assert_includes art.categories_including_virtual(true), c2
+		assert_includes art.categories_including_virtual(true), c1
   end
   should 'redefine the entire category set at once' do
@@ -423,26 +429,31 @@ class ArticleTest &lt; ActiveSupport::TestCase
     art.category_ids = [c2,c3].map(&:id)
     assert_equivalent [c2, c3], art.categories(true)
+		assert_includes art.categories_including_virtual(true), c1
+		assert !art.categories_including_virtual(true).include?(c4)
   end
   should 'be able to create an article already with categories' do
-    c1 = fast_create(Category, :environment_id => Environment.default.id, :name => 'c1')
+    parent1 = fast_create(Category, :environment_id => Environment.default.id, :name => 'parent1')
+    c1 = fast_create(Category, :environment_id => Environment.default.id, :name => 'c1', :parent_id => parent1.id)
     c2 = fast_create(Category, :environment_id => Environment.default.id, :name => 'c2')
     p = create_user('testinguser').person
     a = p.articles.create!(:name => 'test', :category_ids => [c1.id, c2.id])
     assert_equivalent [c1, c2], a.categories(true)
+		assert_includes a.categories_including_virtual(true), parent1
   end
   should 'not add a category twice to article' do
     c1 = fast_create(Category, :environment_id => Environment.default.id, :name => 'c1')
-    c2 = c1.children.create!(:environment => Environment.default, :name => 'c2')
-    c3 = c1.children.create!(:environment => Environment.default, :name => 'c3')
+    c2 = c1.children.create!(:environment => Environment.default, :name => 'c2', :parent_id => c1.id)
+    c3 = c1.children.create!(:environment => Environment.default, :name => 'c3', :parent_id => c1.id)
     owner = create_user('testuser').person
     art = owner.articles.create!(:name => 'ytest')
     art.category_ids = [c2,c3,c3].map(&:id)
     assert_equal [c2, c3], art.categories(true)
+    assert_equal [c2, c1, c3], art.categories_including_virtual(true)
   end
   should 'not accept Product category as category' do
@@ -459,8 +470,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
     article = fast_create(Article, :name => 'test article', :profile_id => profile.id, :published => false)
     assert !article.display_to?(nil)
-  end 
-  
+  end
+
   should 'say that not member of profile cannot see private article' do
     profile = fast_create(Profile, :name => 'test profile', :identifier => 'test_profile')
     article = fast_create(Article, :name => 'test article', :profile_id => profile.id, :published => false)
@@ -468,7 +479,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert !article.display_to?(person)
   end
-  
+
   should 'say that member user can not see private article' do
     profile = fast_create(Profile, :name => 'test profile', :identifier => 'test_profile')
     article = fast_create(Article, :name => 'test article', :profile_id => profile.id, :published => false)
@@ -553,7 +564,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     person = create_user('test_user').person
     a = person.articles.create!(:name => 'test article', :body => 'some text')
     b = a.copy(:parent => a, :profile => a.profile)
-    
+
     assert_includes a.children, b
     assert_equal 'some text', b.body
   end
@@ -752,10 +763,12 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'ignore category with zero as id' do
     a = profile.articles.create!(:name => 'a test article')
-    c = fast_create(Category, :name => 'test category', :environment_id => profile.environment.id)
+    c = fast_create(Category, :name => 'test category', :environment_id => profile.environment.id, :parent_id => 0)
     a.category_ids = ['0', c.id, nil]
     assert a.save
     assert_equal [c], a.categories
+    # also ignore parent with id = 0
+    assert_equal [c], a.categories_including_virtual
     a = profile.articles.find_by_name 'a test article'
     assert_equal [c], a.categories
@@ -810,7 +823,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'find articles in a specific category' do
     env = Environment.default
-    category_with_articles = env.categories.create!(:name => "Category with articles")
+    parent_category = env.categories.create!(:name => "parent category")
+    category_with_articles = env.categories.create!(:name => "Category with articles", :parent_id => parent_category.id)
     category_without_articles = env.categories.create!(:name => "Category without articles")
     article_in_category = profile.articles.create!(:name => 'Article in category')
@@ -818,6 +832,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     article_in_category.add_category(category_with_articles)
     assert_includes profile.articles.in_category(category_with_articles), article_in_category
+    assert_includes profile.articles.in_category(parent_category), article_in_category
     assert_not_includes profile.articles.in_category(category_without_articles), article_in_category
   end
@@ -954,7 +969,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'track action when a published article is created in a community' do
     community = fast_create(Community)
-    p1 = ActionTracker::Record.current_user_from_model 
+    p1 = ActionTracker::Record.current_user_from_model
     p2 = fast_create(Person)
     p3 = fast_create(Person)
     community.add_member(p1)
@@ -1064,7 +1079,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal false, a.notifiable?
     assert_equal true, a.advertise?
     assert_equal false, a.is_trackable?
-   
+
     a.published=false
     assert_equal false, a.published?
     assert_equal false, a.is_trackable?
@@ -1643,4 +1658,67 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal [c1,c2,c5], Article.text_articles
   end
+  should 'act as faceted' do
+    person = fast_create(Person)
+	  a = Article.new(:profile_id => person.id)
+		assert_equal Article.type_name, Article.facet_by_id(:f_type)[:proc].call(a.send(:f_type))
+		assert_equal Person.type_name, Article.facet_by_id(:f_profile_type)[:proc].call(a.send(:f_profile_type))
+	  assert_equal a.published_at, a.send(:f_published_at)
+  end
+
+  should 'act as searchable' do
+    person = fast_create(Person, :name => "Hiro", :address => 'U-Stor-It @ Inglewood, California',
+			:nickname => 'Protagonist')
+		person2 = fast_create(Person, :name => "Raven")
+		category = fast_create(Category, :name => "science fiction", :acronym => "sf", :abbreviation => "sci-fi")
+	  a = Article.create!(:name => 'a searchable article about bananas', :profile_id => person.id,
+			:body => 'the body talks about mosquitos', :abstract => 'and the abstract is about beer',
+			:filename => 'not_a_virus.exe')
+		a.add_category(category)
+		c = a.comments.build(:title => 'snow crash', :author => person2, :body => 'wanna try some?')
+		c.save!
+
+		# fields
+	  assert_includes Article.find_by_contents('bananas')[:results].docs, a
+	  assert_includes Article.find_by_contents('mosquitos')[:results].docs, a
+	  assert_includes Article.find_by_contents('beer')[:results].docs, a
+	  assert_includes Article.find_by_contents('not_a_virus.exe')[:results].docs, a
+		# filters
+	  assert_includes Article.find_by_contents('bananas', {}, {
+			:filter_queries => ["public:true"]})[:results].docs, a
+	  assert_not_includes Article.find_by_contents('bananas', {}, {
+			:filter_queries => ["public:false"]})[:results].docs, a
+	  assert_includes Article.find_by_contents('bananas', {}, {
+			:filter_queries => ["environment_id:\"#{Environment.default.id}\""]})[:results].docs, a
+	  assert_includes Article.find_by_contents('bananas', {}, {
+			:filter_queries => ["profile_id:\"#{person.id}\""]})[:results].docs, a
+    # includes
+	  assert_includes Article.find_by_contents('Hiro')[:results].docs, a
+	  assert_includes Article.find_by_contents("person-#{person.id}")[:results].docs, a
+	  assert_includes Article.find_by_contents("California")[:results].docs, a
+	  assert_includes Article.find_by_contents("Protagonist")[:results].docs, a
+	  assert_includes Article.find_by_contents("snow")[:results].docs, a
+	  assert_includes Article.find_by_contents("try some")[:results].docs, a
+	  assert_includes Article.find_by_contents("Raven")[:results].docs, a
+	  assert_includes Article.find_by_contents("science")[:results].docs, a
+	  assert_includes Article.find_by_contents(category.slug)[:results].docs, a
+	  assert_includes Article.find_by_contents("sf")[:results].docs, a
+	  assert_includes Article.find_by_contents("sci-fi")[:results].docs, a
+  end
+
+  should 'boost name matches' do
+    person = fast_create(Person)
+	  in_body = Article.create!(:name => 'something', :profile_id => person.id, :body => 'bananas in the body!')
+	  in_name = Article.create!(:name => 'bananas in the name!', :profile_id => person.id)
+	  assert_equal [in_name, in_body], Article.find_by_contents('bananas')[:results].docs
+  end
+
+  should 'boost if profile is enabled' do
+    person2 = fast_create(Person, :enabled => false)
+	  art_profile_disabled = Article.create!(:name => 'profile disabled', :profile_id => person2.id)
+    person1 = fast_create(Person, :enabled => true)
+	  art_profile_enabled = Article.create!(:name => 'profile enabled', :profile_id => person1.id)
+	  assert_equal [art_profile_enabled, art_profile_disabled], Article.find_by_contents('profile')[:results].docs
+	end
+
 end
@@ -492,4 +492,30 @@ class CategoryTest &lt; ActiveSupport::TestCase
     assert_not_includes Category.top_level_for(Environment.default).from_types(['ProductCategory']), toplevel_category
   end
+  should 'act as searchable' do
+		parent = fast_create(Category, :name => 'books')
+		c = Category.create!(:name => "science fiction", :acronym => "sf", :abbreviation => "sci-fi",
+			:environment_id => Environment.default.id, :parent_id => parent.id)
+
+		# fields
+	  assert_includes Category.find_by_contents('fiction')[:results].docs, c
+	  assert_includes Category.find_by_contents('sf')[:results].docs, c
+	  assert_includes Category.find_by_contents('sci-fi')[:results].docs, c
+		# filters
+	  assert_includes Category.find_by_contents('science', {}, {
+			:filter_queries => ["parent_id:#{parent.id}"]})[:results].docs, c
+  end
+
+  should 'boost name matches' do
+		c_abbr = Category.create!(:name => "something else", :abbreviation => "science", :environment_id => Environment.default.id)
+		c_name = Category.create!(:name => "science fiction", :environment_id => Environment.default.id)
+		assert_equal [c_name, c_abbr], Category.find_by_contents("science")[:results].docs
+  end
+
+	should 'solr save' do
+    c = @env.categories.build(:name => 'my category');
+		c.expects(:solr_save)
+		c.save!
+	end
+
 end
@@ -20,14 +20,14 @@ class ProductTest &lt; ActiveSupport::TestCase
     assert_difference Product, :count do
       p = Product.new(:name => 'test product1', :product_category => @product_category, :enterprise_id => @profile.id)
       assert p.save
-    end    
+    end
   end
   should 'destroy product' do
     p = fast_create(Product, :name => 'test product2', :product_category_id => @product_category.id)
     assert_difference Product, :count, -1 do
       p.destroy
-    end   
+    end
   end
   should 'display category name if name is nil' do
@@ -69,7 +69,7 @@ class ProductTest &lt; ActiveSupport::TestCase
     p1 = enterprise.products.create!(:name => 'product 1', :product_category => @product_category)
     p2 = enterprise.products.create!(:name => 'product 2', :product_category => @product_category)
     p3 = enterprise.products.create!(:name => 'product 3', :product_category => @product_category)
-    
+
     assert_equal [p3, p2], Product.recent(2)
   end
@@ -79,7 +79,7 @@ class ProductTest &lt; ActiveSupport::TestCase
         :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
       }, :enterprise_id => @profile.id)
       assert_equal p.image(true).filename, 'rails.png'
-    end    
+    end
   end
   should 'calculate catagory full name' do
@@ -125,7 +125,7 @@ class ProductTest &lt; ActiveSupport::TestCase
     ent.lat = 45.0; ent.lng = 45.0; ent.save!
     process_delayed_job_queue
     prod.reload
-   
+
     assert_in_delta 45.0, prod.lat, 0.0001
     assert_in_delta 45.0, prod.lng, 0.0001
   end
@@ -501,4 +501,71 @@ class ProductTest &lt; ActiveSupport::TestCase
     assert_equal 0, product.price_description_percentage
   end
+  should 'act as faceted' do
+		s = fast_create(State, :acronym => 'XZ')
+		c = fast_create(City, :name => 'Tabajara', :parent_id => s.id)
+		ent = fast_create(Enterprise, :region_id => c.id)
+	  p = fast_create(Product, :enterprise_id => ent.id)
+    pq = p.product_qualifiers.create!(:qualifier => fast_create(Qualifier, :name => 'qualifier'),
+			:certifier => fast_create(Certifier, :name => 'certifier'))
+		assert_equal 'Related products', Product.facet_by_id(:f_category)[:label]
+		assert_equal ['Tabajara', ', XZ'], Product.facet_by_id(:f_region)[:proc].call(p.send(:f_region))
+		assert_equal ['qualifier', ' cert. certifier'], Product.facet_by_id(:f_qualifier)[:proc].call(p.send(:f_qualifier).last)
+  end
+
+  should 'act as searchable' do
+		s = fast_create(State, :acronym => 'XZ')
+		c = fast_create(City, :name => 'Tabajara', :parent_id => s.id)
+		ent = fast_create(Enterprise, :region_id => c.id, :name => "Black Sun")
+		category = fast_create(ProductCategory, :name => "homemade", :acronym => "hm", :abbreviation => "homey")
+	  p = Product.create!(:name => 'bananas syrup', :description => 'surrounded by mosquitos', :enterprise_id => ent.id,
+			:product_category_id => category.id)
+		qual = Qualifier.create!(:name => 'qualificador', :environment_id => Environment.default.id)
+		cert = Certifier.create!(:name => 'certificador', :environment_id => Environment.default.id)
+    pq = p.product_qualifiers.create!(:qualifier => qual,	:certifier => cert)
+		# fields
+	  assert_includes Product.find_by_contents('bananas')[:results].docs, p
+	  assert_includes Product.find_by_contents('mosquitos')[:results].docs, p
+	  assert_includes Product.find_by_contents('homemade')[:results].docs, p
+		# filters
+	  assert_includes Product.find_by_contents('bananas', {}, {
+			:filter_queries => ["public:true"]})[:results].docs, p
+	  assert_not_includes Product.find_by_contents('bananas', {}, {
+			:filter_queries => ["public:false"]})[:results].docs, p
+	  assert_includes Product.find_by_contents('bananas', {}, {
+			:filter_queries => ["environment_id:\"#{Environment.default.id}\""]})[:results].docs, p
+    # includes
+	  assert_includes Product.find_by_contents("homemade")[:results].docs, p
+	  assert_includes Product.find_by_contents(category.slug)[:results].docs, p
+	  assert_includes Product.find_by_contents("hm")[:results].docs, p
+	  assert_includes Product.find_by_contents("homey")[:results].docs, p
+	  assert_includes Product.find_by_contents("Tabajara")[:results].docs, p
+	  assert_includes Product.find_by_contents("Black Sun")[:results].docs, p
+  end
+
+  should 'boost name matches' do
+		ent = fast_create(Enterprise)
+		cat = fast_create(ProductCategory)
+	  in_desc = Product.create!(:name => 'something', :enterprise_id => ent.id, :description => 'bananas in the description!',
+			:product_category_id => cat.id)
+	  in_name = Product.create!(:name => 'bananas in the name!', :enterprise_id => ent.id, :product_category_id => cat.id)
+	  assert_equal [in_name, in_desc], Product.find_by_contents('bananas')[:results].docs
+  end
+
+  should 'boost if profile is enabled' do
+    person2 = fast_create(Person, :enabled => false)
+	  art_profile_disabled = Article.create!(:name => 'profile disabled', :profile_id => person2.id)
+    person1 = fast_create(Person, :enabled => true)
+	  art_profile_enabled = Article.create!(:name => 'profile enabled', :profile_id => person1.id)
+	  assert_equal [art_profile_enabled, art_profile_disabled], Article.find_by_contents('profile')[:results].docs
+	end
+
+	should 'reindex enterprise after saving' do
+		ent = fast_create(Enterprise)
+		cat = fast_create(ProductCategory)
+	  prod = Product.create!(:name => 'something', :enterprise_id => ent.id, :product_category_id => cat.id)
+		Product.expects(:solr_batch_add).with([ent])
+		prod.save!
+	end
+
 end
@@ -1770,4 +1770,50 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert !profile.valid?
     assert profile.errors.invalid?(:identifier)
   end
+
+  should 'act as faceted' do
+		st = fast_create(State, :acronym => 'XZ')
+		city = fast_create(City, :name => 'Tabajara', :parent_id => st.id)
+    prof = fast_create(Person, :region_id => city.id)
+		assert_equal ['Tabajara', ', XZ'], Profile.facet_by_id(:f_region)[:proc].call(prof.send(:f_region))
+  end
+
+  should 'act as searchable' do
+		st = fast_create(State, :acronym => 'CA')
+		city = fast_create(City, :name => 'Inglewood', :parent_id => st.id)
+    p = create(Person, :name => "Hiro", :address => 'U-Stor-It', :nickname => 'Protagonist',
+			:user_id => fast_create(User).id, :region_id => city.id)
+		cat = fast_create(Category, :name => "Science Fiction", :acronym => "sf", :abbreviation => "sci-fi")
+		p.add_category cat
+		cat.save!
+		p.save!
+
+		# fields
+	  assert_includes Profile.find_by_contents('Hiro')[:results].docs, p
+	  assert_includes Profile.find_by_contents('Stor')[:results].docs, p
+	  assert_includes Profile.find_by_contents('Protagonist')[:results].docs, p
+		# filters
+	  assert_includes Profile.find_by_contents('Hiro', {}, {
+			:filter_queries => ["public:true"]})[:results].docs, p
+	  assert_not_includes Profile.find_by_contents('Hiro', {}, {
+			:filter_queries => ["public:false"]})[:results].docs, p
+	  assert_includes Profile.find_by_contents('Hiro', {}, {
+			:filter_queries => ["environment_id:\"#{Environment.default.id}\""]})[:results].docs, p
+    # includes
+	  assert_includes Profile.find_by_contents("Inglewood")[:results].docs, p
+  end
+
+  should 'boost name matches' do
+	  in_addr = create(Person, :name => 'something', :address => 'bananas in the address!', :user_id => fast_create(User).id)
+    in_name = create(Person, :name => 'bananas in the name!', :user_id => fast_create(User).id)
+	  assert_equal [in_name, in_addr], Person.find_by_contents('bananas')[:results].docs
+  end
+
+	should 'reindex articles after saving' do
+	  profile = create(Person, :name => 'something', :user_id => fast_create(User).id)
+		art = profile.articles.build(:name => 'something')
+		Profile.expects(:solr_batch_add).with(includes(art))
+		profile.save!
+	end
+
 end
@@ -4,8 +4,6 @@ class SearchHelperTest &lt; ActiveSupport::TestCase
   include SearchHelper
-    
-
   should 'display search page title' do
     title = 'page_title'
     assert_equal search_page_title(title), '<h1>page_title</h1>' 
@@ -190,4 +190,9 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
     article
   end
+  should 'define type facet' do
+	  a = TextileArticle.new
+		assert_equal TextArticle.type_name, TextileArticle.send(:f_type_proc, a.send(:f_type))
+  end
+
 end
@@ -247,4 +247,9 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
     assert TinyMceArticle.new.tiny_mce?
   end
+  should 'define type facet' do
+	  a = TinyMceArticle.new
+		assert_equal TextArticle.type_name, TinyMceArticle.send(:f_type_proc, a.send(:f_type))
+  end
+
 end
	@@ -225,7 +225,7 @@ class Product < ActiveRecord::Base		@@ -225,7 +225,7 @@ class Product < ActiveRecord::Base
225	end	225	end
226	end	226	end
227	def self.f_qualifier_proc(ids)	227	def self.f_qualifier_proc(ids)
228	- array = ids.split ' '	228	+ array = ids.split
229	qualifier = Qualifier.find_by_id array[0]	229	qualifier = Qualifier.find_by_id array[0]
230	certifier = Certifier.find_by_id array[1]	230	certifier = Certifier.find_by_id array[1]
231	certifier ? [qualifier.name, _(' cert. ') + certifier.name] : qualifier.name	231	certifier ? [qualifier.name, _(' cert. ') + certifier.name] : qualifier.name
	@@ -492,4 +492,30 @@ class CategoryTest < ActiveSupport::TestCase		@@ -492,4 +492,30 @@ class CategoryTest < ActiveSupport::TestCase
492	assert_not_includes Category.top_level_for(Environment.default).from_types(['ProductCategory']), toplevel_category	492	assert_not_includes Category.top_level_for(Environment.default).from_types(['ProductCategory']), toplevel_category
493	end	493	end
494		494
		495	+ should 'act as searchable' do
		496	+ parent = fast_create(Category, :name => 'books')
		497	+ c = Category.create!(:name => "science fiction", :acronym => "sf", :abbreviation => "sci-fi",
		498	+ :environment_id => Environment.default.id, :parent_id => parent.id)
		499	+
		500	+ # fields
		501	+ assert_includes Category.find_by_contents('fiction')[:results].docs, c
		502	+ assert_includes Category.find_by_contents('sf')[:results].docs, c
		503	+ assert_includes Category.find_by_contents('sci-fi')[:results].docs, c
		504	+ # filters
		505	+ assert_includes Category.find_by_contents('science', {}, {
		506	+ :filter_queries => ["parent_id:#{parent.id}"]})[:results].docs, c
		507	+ end
		508	+
		509	+ should 'boost name matches' do
		510	+ c_abbr = Category.create!(:name => "something else", :abbreviation => "science", :environment_id => Environment.default.id)
		511	+ c_name = Category.create!(:name => "science fiction", :environment_id => Environment.default.id)
		512	+ assert_equal [c_name, c_abbr], Category.find_by_contents("science")[:results].docs
		513	+ end
		514	+
		515	+ should 'solr save' do
		516	+ c = @env.categories.build(:name => 'my category');
		517	+ c.expects(:solr_save)
		518	+ c.save!
		519	+ end
		520	+
495	end	521	end
	@@ -20,14 +20,14 @@ class ProductTest < ActiveSupport::TestCase		@@ -20,14 +20,14 @@ class ProductTest < ActiveSupport::TestCase
20	assert_difference Product, :count do	20	assert_difference Product, :count do
21	p = Product.new(:name => 'test product1', :product_category => @product_category, :enterprise_id => @profile.id)	21	p = Product.new(:name => 'test product1', :product_category => @product_category, :enterprise_id => @profile.id)
22	assert p.save	22	assert p.save
23	- end	23	+ end
24	end	24	end
25		25
26	should 'destroy product' do	26	should 'destroy product' do
27	p = fast_create(Product, :name => 'test product2', :product_category_id => @product_category.id)	27	p = fast_create(Product, :name => 'test product2', :product_category_id => @product_category.id)
28	assert_difference Product, :count, -1 do	28	assert_difference Product, :count, -1 do
29	p.destroy	29	p.destroy
30	- end	30	+ end
31	end	31	end
32		32
33	should 'display category name if name is nil' do	33	should 'display category name if name is nil' do
	@@ -69,7 +69,7 @@ class ProductTest < ActiveSupport::TestCase		@@ -69,7 +69,7 @@ class ProductTest < ActiveSupport::TestCase
69	p1 = enterprise.products.create!(:name => 'product 1', :product_category => @product_category)	69	p1 = enterprise.products.create!(:name => 'product 1', :product_category => @product_category)
70	p2 = enterprise.products.create!(:name => 'product 2', :product_category => @product_category)	70	p2 = enterprise.products.create!(:name => 'product 2', :product_category => @product_category)
71	p3 = enterprise.products.create!(:name => 'product 3', :product_category => @product_category)	71	p3 = enterprise.products.create!(:name => 'product 3', :product_category => @product_category)
72	-	72	+
73	assert_equal [p3, p2], Product.recent(2)	73	assert_equal [p3, p2], Product.recent(2)
74	end	74	end
75		75
	@@ -79,7 +79,7 @@ class ProductTest < ActiveSupport::TestCase		@@ -79,7 +79,7 @@ class ProductTest < ActiveSupport::TestCase
79	:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')	79	:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
80	}, :enterprise_id => @profile.id)	80	}, :enterprise_id => @profile.id)
81	assert_equal p.image(true).filename, 'rails.png'	81	assert_equal p.image(true).filename, 'rails.png'
82	- end	82	+ end
83	end	83	end
84		84
85	should 'calculate catagory full name' do	85	should 'calculate catagory full name' do
	@@ -125,7 +125,7 @@ class ProductTest < ActiveSupport::TestCase		@@ -125,7 +125,7 @@ class ProductTest < ActiveSupport::TestCase
125	ent.lat = 45.0; ent.lng = 45.0; ent.save!	125	ent.lat = 45.0; ent.lng = 45.0; ent.save!
126	process_delayed_job_queue	126	process_delayed_job_queue
127	prod.reload	127	prod.reload
128	-	128	+
129	assert_in_delta 45.0, prod.lat, 0.0001	129	assert_in_delta 45.0, prod.lat, 0.0001
130	assert_in_delta 45.0, prod.lng, 0.0001	130	assert_in_delta 45.0, prod.lng, 0.0001
131	end	131	end
	@@ -501,4 +501,71 @@ class ProductTest < ActiveSupport::TestCase		@@ -501,4 +501,71 @@ class ProductTest < ActiveSupport::TestCase
501	assert_equal 0, product.price_description_percentage	501	assert_equal 0, product.price_description_percentage
502	end	502	end
503		503
		504	+ should 'act as faceted' do
		505	+ s = fast_create(State, :acronym => 'XZ')
		506	+ c = fast_create(City, :name => 'Tabajara', :parent_id => s.id)
		507	+ ent = fast_create(Enterprise, :region_id => c.id)
		508	+ p = fast_create(Product, :enterprise_id => ent.id)
		509	+ pq = p.product_qualifiers.create!(:qualifier => fast_create(Qualifier, :name => 'qualifier'),
		510	+ :certifier => fast_create(Certifier, :name => 'certifier'))
		511	+ assert_equal 'Related products', Product.facet_by_id(:f_category)[:label]
		512	+ assert_equal ['Tabajara', ', XZ'], Product.facet_by_id(:f_region)[:proc].call(p.send(:f_region))
		513	+ assert_equal ['qualifier', ' cert. certifier'], Product.facet_by_id(:f_qualifier)[:proc].call(p.send(:f_qualifier).last)
		514	+ end
		515	+
		516	+ should 'act as searchable' do
		517	+ s = fast_create(State, :acronym => 'XZ')
		518	+ c = fast_create(City, :name => 'Tabajara', :parent_id => s.id)
		519	+ ent = fast_create(Enterprise, :region_id => c.id, :name => "Black Sun")
		520	+ category = fast_create(ProductCategory, :name => "homemade", :acronym => "hm", :abbreviation => "homey")
		521	+ p = Product.create!(:name => 'bananas syrup', :description => 'surrounded by mosquitos', :enterprise_id => ent.id,
		522	+ :product_category_id => category.id)
		523	+ qual = Qualifier.create!(:name => 'qualificador', :environment_id => Environment.default.id)
		524	+ cert = Certifier.create!(:name => 'certificador', :environment_id => Environment.default.id)
		525	+ pq = p.product_qualifiers.create!(:qualifier => qual, :certifier => cert)
		526	+ # fields
		527	+ assert_includes Product.find_by_contents('bananas')[:results].docs, p
		528	+ assert_includes Product.find_by_contents('mosquitos')[:results].docs, p
		529	+ assert_includes Product.find_by_contents('homemade')[:results].docs, p
		530	+ # filters
		531	+ assert_includes Product.find_by_contents('bananas', {}, {
		532	+ :filter_queries => ["public:true"]})[:results].docs, p
		533	+ assert_not_includes Product.find_by_contents('bananas', {}, {
		534	+ :filter_queries => ["public:false"]})[:results].docs, p
		535	+ assert_includes Product.find_by_contents('bananas', {}, {
		536	+ :filter_queries => ["environment_id:\"#{Environment.default.id}\""]})[:results].docs, p
		537	+ # includes
		538	+ assert_includes Product.find_by_contents("homemade")[:results].docs, p
		539	+ assert_includes Product.find_by_contents(category.slug)[:results].docs, p
		540	+ assert_includes Product.find_by_contents("hm")[:results].docs, p
		541	+ assert_includes Product.find_by_contents("homey")[:results].docs, p
		542	+ assert_includes Product.find_by_contents("Tabajara")[:results].docs, p
		543	+ assert_includes Product.find_by_contents("Black Sun")[:results].docs, p
		544	+ end
		545	+
		546	+ should 'boost name matches' do
		547	+ ent = fast_create(Enterprise)
		548	+ cat = fast_create(ProductCategory)
		549	+ in_desc = Product.create!(:name => 'something', :enterprise_id => ent.id, :description => 'bananas in the description!',
		550	+ :product_category_id => cat.id)
		551	+ in_name = Product.create!(:name => 'bananas in the name!', :enterprise_id => ent.id, :product_category_id => cat.id)
		552	+ assert_equal [in_name, in_desc], Product.find_by_contents('bananas')[:results].docs
		553	+ end
		554	+
		555	+ should 'boost if profile is enabled' do
		556	+ person2 = fast_create(Person, :enabled => false)
		557	+ art_profile_disabled = Article.create!(:name => 'profile disabled', :profile_id => person2.id)
		558	+ person1 = fast_create(Person, :enabled => true)
		559	+ art_profile_enabled = Article.create!(:name => 'profile enabled', :profile_id => person1.id)
		560	+ assert_equal [art_profile_enabled, art_profile_disabled], Article.find_by_contents('profile')[:results].docs
		561	+ end
		562	+
		563	+ should 'reindex enterprise after saving' do
		564	+ ent = fast_create(Enterprise)
		565	+ cat = fast_create(ProductCategory)
		566	+ prod = Product.create!(:name => 'something', :enterprise_id => ent.id, :product_category_id => cat.id)
		567	+ Product.expects(:solr_batch_add).with([ent])
		568	+ prod.save!
		569	+ end
		570	+
504	end	571	end
	@@ -1770,4 +1770,50 @@ class ProfileTest < ActiveSupport::TestCase		@@ -1770,4 +1770,50 @@ class ProfileTest < ActiveSupport::TestCase
1770	assert !profile.valid?	1770	assert !profile.valid?
1771	assert profile.errors.invalid?(:identifier)	1771	assert profile.errors.invalid?(:identifier)
1772	end	1772	end
		1773	+
		1774	+ should 'act as faceted' do
		1775	+ st = fast_create(State, :acronym => 'XZ')
		1776	+ city = fast_create(City, :name => 'Tabajara', :parent_id => st.id)
		1777	+ prof = fast_create(Person, :region_id => city.id)
		1778	+ assert_equal ['Tabajara', ', XZ'], Profile.facet_by_id(:f_region)[:proc].call(prof.send(:f_region))
		1779	+ end
		1780	+
		1781	+ should 'act as searchable' do
		1782	+ st = fast_create(State, :acronym => 'CA')
		1783	+ city = fast_create(City, :name => 'Inglewood', :parent_id => st.id)
		1784	+ p = create(Person, :name => "Hiro", :address => 'U-Stor-It', :nickname => 'Protagonist',
		1785	+ :user_id => fast_create(User).id, :region_id => city.id)
		1786	+ cat = fast_create(Category, :name => "Science Fiction", :acronym => "sf", :abbreviation => "sci-fi")
		1787	+ p.add_category cat
		1788	+ cat.save!
		1789	+ p.save!
		1790	+
		1791	+ # fields
		1792	+ assert_includes Profile.find_by_contents('Hiro')[:results].docs, p
		1793	+ assert_includes Profile.find_by_contents('Stor')[:results].docs, p
		1794	+ assert_includes Profile.find_by_contents('Protagonist')[:results].docs, p
		1795	+ # filters
		1796	+ assert_includes Profile.find_by_contents('Hiro', {}, {
		1797	+ :filter_queries => ["public:true"]})[:results].docs, p
		1798	+ assert_not_includes Profile.find_by_contents('Hiro', {}, {
		1799	+ :filter_queries => ["public:false"]})[:results].docs, p
		1800	+ assert_includes Profile.find_by_contents('Hiro', {}, {
		1801	+ :filter_queries => ["environment_id:\"#{Environment.default.id}\""]})[:results].docs, p
		1802	+ # includes
		1803	+ assert_includes Profile.find_by_contents("Inglewood")[:results].docs, p
		1804	+ end
		1805	+
		1806	+ should 'boost name matches' do
		1807	+ in_addr = create(Person, :name => 'something', :address => 'bananas in the address!', :user_id => fast_create(User).id)
		1808	+ in_name = create(Person, :name => 'bananas in the name!', :user_id => fast_create(User).id)
		1809	+ assert_equal [in_name, in_addr], Person.find_by_contents('bananas')[:results].docs
		1810	+ end
		1811	+
		1812	+ should 'reindex articles after saving' do
		1813	+ profile = create(Person, :name => 'something', :user_id => fast_create(User).id)
		1814	+ art = profile.articles.build(:name => 'something')
		1815	+ Profile.expects(:solr_batch_add).with(includes(art))
		1816	+ profile.save!
		1817	+ end
		1818	+
1773	end	1819	end
	@@ -4,8 +4,6 @@ class SearchHelperTest < ActiveSupport::TestCase		@@ -4,8 +4,6 @@ class SearchHelperTest < ActiveSupport::TestCase
4		4
5	include SearchHelper	5	include SearchHelper
6		6
7	-
8	-
9	should 'display search page title' do	7	should 'display search page title' do
10	title = 'page_title'	8	title = 'page_title'
11	assert_equal search_page_title(title), '<h1>page_title</h1>'	9	assert_equal search_page_title(title), '<h1>page_title</h1>'
	@@ -190,4 +190,9 @@ class TextileArticleTest < ActiveSupport::TestCase		@@ -190,4 +190,9 @@ class TextileArticleTest < ActiveSupport::TestCase
190	article	190	article
191	end	191	end
192		192
		193	+ should 'define type facet' do
		194	+ a = TextileArticle.new
		195	+ assert_equal TextArticle.type_name, TextileArticle.send(:f_type_proc, a.send(:f_type))
		196	+ end
		197	+
193	end	198	end
	@@ -247,4 +247,9 @@ class TinyMceArticleTest < ActiveSupport::TestCase		@@ -247,4 +247,9 @@ class TinyMceArticleTest < ActiveSupport::TestCase
247	assert TinyMceArticle.new.tiny_mce?	247	assert TinyMceArticle.new.tiny_mce?
248	end	248	end
249		249
		250	+ should 'define type facet' do
		251	+ a = TinyMceArticle.new
		252	+ assert_equal TextArticle.type_name, TinyMceArticle.send(:f_type_proc, a.send(:f_type))
		253	+ end
		254	+
250	end	255	end