Download as
Browse Code »

Commit 2efd9dfb7cd7d7028d8651415a0d196cf4329a6e

Authored by Rodrigo Souto
1 parent 195bb241
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

[postgres-tests] Fixing profile controller tests

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
test/functional/profile_controller_test.rb
  Diff comments   View file @2efd9df
@@ -308,7 +308,7 @@ class ProfileControllerTest < ActionController::TestCase @@ -308,7 +308,7 @@ class ProfileControllerTest < ActionController::TestCase
308 308
309 should 'not display contact us for non-enterprises' do 309 should 'not display contact us for non-enterprises' do
310 @profile.boxes.first.blocks << block = ProfileInfoBlock.create! 310 @profile.boxes.first.blocks << block = ProfileInfoBlock.create!
311 - get :profile_info, :profile => @profile, :block_id => block.id 311 + get :profile_info, :profile => @profile.identifier, :block_id => block.id
312 assert_no_match /\/contact\/#{@profile.identifier}\/new/, @response.body 312 assert_no_match /\/contact\/#{@profile.identifier}\/new/, @response.body
313 end 313 end
314 314
@@ -992,7 +992,7 @@ class ProfileControllerTest &lt; ActionController::TestCase @@ -992,7 +992,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
992 992
993 should 'the activities be paginated in people profiles' do 993 should 'the activities be paginated in people profiles' do
994 p1 = Person.first 994 p1 = Person.first
995 - 40.times{fast_create(Scrap, :sender_id => p1.id, :created_at => Time.now)} 995 + 40.times{fast_create(Scrap, :receiver_id => p1.id, :created_at => Time.now)}
996 996
997 @controller.stubs(:logged_in?).returns(true) 997 @controller.stubs(:logged_in?).returns(true)
998 user = mock() 998 user = mock()