Download as
Browse Code »

Commit 1aa32327775f8f27af3b3c65d97d0dffd9bebe0f

Authored by Antonio Terceiro
1 parent 9abc0b34
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

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 17 end
18 18 @tags = profile.article_tags
19 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 25 end
23 26 end
24 27  
... ... @@ -395,6 +398,7 @@ class ProfileController < PublicController
395 398  
396 399 def private_profile
397 400 private_profile_partial_parameters
  401 + render :action => 'index', :status => 403
398 402 end
399 403  
400 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 130 assert_equal "This <strong>is</strong> my new environment", Environment.default.message_for_disabled_enterprise
131 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 133 should 'set portal community' do
139 134 e = Environment.default
140 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 314 Time.stubs(:now).returns(now)
315 315 xhr :post, :create, :profile => community.identifier, :id => page.id, :comment => {:body => 'Some comment...'}, :confirm => 'true'
316 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 318 end
319 319  
320 320 should "render_target be nil in article with moderation" do
... ...