From d17e27672f833433ac90c24ac295ee16d64c37ee Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Thu, 8 Dec 2011 20:00:48 -0200
Subject: [PATCH] Fixing tests in SearchController

---
 test/functional/search_controller_test.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index e29a411..23738d8 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -423,7 +423,7 @@ class SearchControllerTest < ActionController::TestCase
     get :index, :category_path => [ 'randomcat', 'randomchild' ], :query => 'some random query', :search_whole_site => 'yes'
 
     # search_whole_site must be removed to precent a infinite redirect loop
-    assert_redirected_to :action => 'index', :category_path => [], :query => 'some random query', :search_whole_site => nil
+    assert_redirected_to :controller.to_s => 'search', :action.to_s => 'index', :category_path.to_s => [], :query.to_s => 'some random query', :search_whole_site.to_s => nil, :search_whole_site_yes.to_s => nil
   end
 
   should 'submit form to root when not inside a filter' do
@@ -456,7 +456,7 @@ class SearchControllerTest < ActionController::TestCase
     finder = CategoryFinder.new(@category)
     finder.expects(:recent).with(any_parameters).at_least_once
     finder.expects(:recent).with('text_articles', anything).returns(recent)
-    CategoryFinder.expects(:new).with(@category).returns(finder)
+    CategoryFinder.stubs(:new).with(@category).returns(finder)
 
     get :category_index, :category_path => [ 'my-category' ]
     assert_same recent, assigns(:results)[:articles]
@@ -466,7 +466,7 @@ class SearchControllerTest < ActionController::TestCase
     most_commented = []
     finder = CategoryFinder.new(@category)
     finder.expects(:most_commented_articles).returns(most_commented)
-    CategoryFinder.expects(:new).with(@category).returns(finder)
+    CategoryFinder.stubs(:new).with(@category).returns(finder)
 
     get :category_index, :category_path => [ 'my-category' ]
     assert_same most_commented, assigns(:results)[:most_commented_articles]
@@ -477,7 +477,7 @@ class SearchControllerTest < ActionController::TestCase
     finder = CategoryFinder.new(@category)
     finder.expects(:recent).with(any_parameters).at_least_once
     finder.expects(:recent).with('people', kind_of(Integer)).returns(recent_people)
-    CategoryFinder.expects(:new).with(@category).returns(finder)
+    CategoryFinder.stubs(:new).with(@category).returns(finder)
 
     get :category_index, :category_path => [ 'my-category' ]
     assert_same recent_people, assigns(:results)[:people]
@@ -488,7 +488,7 @@ class SearchControllerTest < ActionController::TestCase
     finder = CategoryFinder.new(@category)
     finder.expects(:recent).with(any_parameters).at_least_once
     finder.expects(:recent).with('communities', anything).returns(recent_communities)
-    CategoryFinder.expects(:new).with(@category).returns(finder)
+    CategoryFinder.stubs(:new).with(@category).returns(finder)
 
     get :category_index, :category_path => [ 'my-category' ]
     assert_same recent_communities, assigns(:results)[:communities]
@@ -499,7 +499,7 @@ class SearchControllerTest < ActionController::TestCase
     finder = CategoryFinder.new(@category)
     finder.expects(:recent).with(any_parameters).at_least_once
     finder.expects(:recent).with('enterprises', anything).returns(recent_enterptises)
-    CategoryFinder.expects(:new).with(@category).returns(finder)
+    CategoryFinder.stubs(:new).with(@category).returns(finder)
 
     get :category_index, :category_path => [ 'my-category' ]
     assert_same recent_enterptises, assigns(:results)[:enterprises]
@@ -987,7 +987,7 @@ class SearchControllerTest < ActionController::TestCase
     most_commented = [art]
     finder = CategoryFinder.new(@category)
     finder.expects(:most_commented_articles).returns(most_commented)
-    CategoryFinder.expects(:new).with(@category).returns(finder)
+    CategoryFinder.stubs(:new).with(@category).returns(finder)
 
     get :category_index, :category_path => [ 'my-category' ]
     assert_tag :tag => 'div', :attributes => {:class => /search-results-most_commented_articles/} , :descendant => {:tag => 'a', :attributes => { :href => '/search/index/my-category?asset=articles'}}
--
libgit2 0.21.2