From 51dfc2df0e92a326d416ac9b9cda039b7c32a654 Mon Sep 17 00:00:00 2001 From: Rafael Martins Date: Sun, 15 Apr 2012 20:26:16 -0300 Subject: [PATCH] A few test fixes for dealing with the new search results --- test/functional/profile_search_controller_test.rb | 2 +- test/unit/article_test.rb | 4 ++-- test/unit/text_article_test.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/functional/profile_search_controller_test.rb b/test/functional/profile_search_controller_test.rb index f79bab7..3ae46c2 100644 --- a/test/functional/profile_search_controller_test.rb +++ b/test/functional/profile_search_controller_test.rb @@ -51,7 +51,7 @@ class ProfileSearchControllerTest < ActionController::TestCase get 'index', :profile => person.identifier, :q => 'Article' - assert_equal 10, assigns(:results).size + assert_equal 10, assigns('results').docs.size assert_tag :tag => 'a', :attributes => { :href => "/profile/#{person.identifier}/search?page=2&q=Article", :rel => 'next' } end diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb index 3a574ba..cc4a24a 100644 --- a/test/unit/article_test.rb +++ b/test/unit/article_test.rb @@ -1512,7 +1512,7 @@ class ArticleTest < ActiveSupport::TestCase should 'index by schema name when database is postgresql' do uses_postgresql 'schema_one' art1 = Article.create!(:name => 'some thing', :profile_id => @profile.id) - assert_equal [art1], Article.find_by_contents('thing')[:results] + assert_equal [art1], Article.find_by_contents('thing')[:results].docs uses_postgresql 'schema_two' art2 = Article.create!(:name => 'another thing', :profile_id => @profile.id) assert_not_includes Article.find_by_contents('thing')[:results], art1 @@ -1526,7 +1526,7 @@ class ArticleTest < ActiveSupport::TestCase should 'not index by schema name when database is not postgresql' do uses_sqlite art1 = Article.create!(:name => 'some thing', :profile_id => @profile.id) - assert_equal Article.find_by_contents('thing')[:results], [art1] + assert_equal [art1], Article.find_by_contents('thing')[:results].docs art2 = Article.create!(:name => 'another thing', :profile_id => @profile.id) assert_includes Article.find_by_contents('thing')[:results], art1 assert_includes Article.find_by_contents('thing')[:results], art2 diff --git a/test/unit/text_article_test.rb b/test/unit/text_article_test.rb index c071164..1a1c532 100644 --- a/test/unit/text_article_test.rb +++ b/test/unit/text_article_test.rb @@ -17,7 +17,7 @@ class TextArticleTest < ActiveSupport::TestCase should 'found TextileArticle by TextArticle indexes' do person = create_user('testuser').person article = TextileArticle.create!(:name => 'found article test', :profile => person) - assert_equal TextileArticle.find_by_contents('found'), TextArticle.find_by_contents('found') + assert_equal TextileArticle.find_by_contents('found')[:results].docs, TextArticle.find_by_contents('found')[:results].docs end should 'remove HTML from name' do -- libgit2 0.21.2