Download as
Browse Code »

Commit 4055244823591fa1870f41050c1440057a35c13a

Authored by AntonioTerceiro
1 parent b71b8f5d
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

ActionItem31: displaying home page 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@978 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 22 additions and 7 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @4055244
@@ -7,13 +7,14 @@ class ContentViewerController < PublicController @@ -7,13 +7,14 @@ class ContentViewerController < PublicController
7 7
8 if path.blank? 8 if path.blank?
9 @page = profile.home_page 9 @page = profile.home_page
10 - # FIXME need to do something when the user didn't set a homepage 10 + if @page.nil?
  11 + render :action => 'no_home_page'
  12 + end
11 else 13 else
12 @page = profile.articles.find_by_path(path) 14 @page = profile.articles.find_by_path(path)
13 - end  
14 -  
15 - if @page.nil?  
16 - render_not_found(@path) 15 + if @page.nil?
  16 + render_not_found(@path)
  17 + end
17 end 18 end
18 end 19 end
19 20
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @4055244
@@ -28,11 +28,25 @@ class ContentViewerControllerTest < Test::Unit::TestCase @@ -28,11 +28,25 @@ class ContentViewerControllerTest < Test::Unit::TestCase
28 end 28 end
29 29
30 def test_should_display_homepage 30 def test_should_display_homepage
31 - flunk 'pending' 31 + a = profile.articles.build(:name => 'test')
  32 + a.save!
  33 + profile.home_page = a
  34 + profile.save!
  35 +
  36 + get :view_page, :profile => profile.identifier, :page => [ 'test']
  37 +
  38 + assert_response :success
  39 + assert_template 'view_page'
  40 + assert_equal a, assigns(:page)
32 end 41 end
33 42
34 def test_should_display_something_else_for_empty_homepage 43 def test_should_display_something_else_for_empty_homepage
35 - flunk 'pending' 44 + profile.articles.destroy_all
  45 +
  46 + get :view_page, :profile => profile.identifier, :page => []
  47 +
  48 + assert_response :success
  49 + assert_template 'no_home_page'
36 end 50 end
37 51
38 def test_should_get_not_found_error_for_unexisting_page 52 def test_should_get_not_found_error_for_unexisting_page