Download as
Browse Code »

Commit 1aa32327775f8f27af3b3c65d97d0dffd9bebe0f

Authored by Antonio Terceiro
1 parent 9abc0b34
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix broken functional tests

Showing 3 changed files with 7 additions and 8 deletions   Show diff stats
app/controllers/public/profile_controller.rb
  Diff comments   View file @1aa3232
@@ -17,8 +17,11 @@ class ProfileController < PublicController @@ -17,8 +17,11 @@ class ProfileController < PublicController
17 end 17 end
18 @tags = profile.article_tags 18 @tags = profile.article_tags
19 unless profile.display_info_to?(user) 19 unless profile.display_info_to?(user)
20 - profile.visible? ? private_profile : invisible_profile  
21 - render :action => 'index', :status => 403 20 + if profile.visible?
  21 + private_profile
  22 + else
  23 + invisible_profile
  24 + end
22 end 25 end
23 end 26 end
24 27
@@ -395,6 +398,7 @@ class ProfileController < PublicController @@ -395,6 +398,7 @@ class ProfileController < PublicController
395 398
396 def private_profile 399 def private_profile
397 private_profile_partial_parameters 400 private_profile_partial_parameters
  401 + render :action => 'index', :status => 403
398 end 402 end
399 403
400 def invisible_profile 404 def invisible_profile
test/functional/admin_panel_controller_test.rb
  Diff comments   View file @1aa3232
@@ -130,11 +130,6 @@ class AdminPanelControllerTest < ActionController::TestCase @@ -130,11 +130,6 @@ class AdminPanelControllerTest < ActionController::TestCase
130 assert_equal "This <strong>is</strong> my new environment", Environment.default.message_for_disabled_enterprise 130 assert_equal "This <strong>is</strong> my new environment", Environment.default.message_for_disabled_enterprise
131 end 131 end
132 132
133 - should 'always use WYSIWYG' do  
134 - get :site_info  
135 - assert_tag :tag => "script", :content => /tinyMCE\.init/  
136 - end  
137 -  
138 should 'set portal community' do 133 should 'set portal community' do
139 e = Environment.default 134 e = Environment.default
140 @controller.stubs(:environment).returns(e) 135 @controller.stubs(:environment).returns(e)
test/functional/comment_controller_test.rb
  Diff comments   View file @1aa3232
@@ -314,7 +314,7 @@ class CommentControllerTest &lt; ActionController::TestCase @@ -314,7 +314,7 @@ class CommentControllerTest &lt; ActionController::TestCase
314 Time.stubs(:now).returns(now) 314 Time.stubs(:now).returns(now)
315 xhr :post, :create, :profile => community.identifier, :id => page.id, :comment => {:body => 'Some comment...'}, :confirm => 'true' 315 xhr :post, :create, :profile => community.identifier, :id => page.id, :comment => {:body => 'Some comment...'}, :confirm => 'true'
316 task = Task.last 316 task = Task.last
317 - assert_equal now.to_s, task.comment.created_at.to_s 317 + assert_equal now.utc.to_s, task.comment.created_at.utc.to_s
318 end 318 end
319 319
320 should "render_target be nil in article with moderation" do 320 should "render_target be nil in article with moderation" do