Download as
Browse Code »

Commit 9a80f26153e994d6c29711125de82926d8c1929b

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

ActionItem436: falling back to current year/month 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2016 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 24 additions and 0 deletions   Show diff stats
app/helpers/dates_helper.rb
  Diff comments   View file @9a80f26
@@ -42,6 +42,14 @@ module DatesHelper @@ -42,6 +42,14 @@ module DatesHelper
42 end 42 end
43 43
44 def show_month(year, month) 44 def show_month(year, month)
  45 +
  46 + if year.blank?
  47 + year = Date.today.year
  48 + end
  49 + if month.blank?
  50 + month = Date.today.month
  51 + end
  52 +
45 # FIXME Date#strftime should translate this for us !!! 53 # FIXME Date#strftime should translate this for us !!!
46 monthname = _([ 54 monthname = _([
47 N_('January'), 55 N_('January'),
test/functional/search_controller_test.rb
  Diff comments   View file @9a80f26
@@ -814,6 +814,13 @@ class SearchControllerTest < Test::Unit::TestCase @@ -814,6 +814,13 @@ class SearchControllerTest < Test::Unit::TestCase
814 assert_equal 0, assigns(:calendar).size % 7 814 assert_equal 0, assigns(:calendar).size % 7
815 end 815 end
816 816
  817 + should 'display current year/month by default' do
  818 + Date.expects(:today).returns(Date.new(2008, 8, 1)).at_least_once
  819 +
  820 + get :assets, :asset => 'events'
  821 + assert_tag :tag => 'h1', :content => /^\s*August 2008\s*$/
  822 + end
  823 +
817 should 'submit search form to /search when viewing asset' do 824 should 'submit search form to /search when viewing asset' do
818 get :index, :asset => 'people' 825 get :index, :asset => 'people'
819 assert_tag :tag => "form", :attributes => { :class => 'search_form', :action => '/search' } 826 assert_tag :tag => "form", :attributes => { :class => 'search_form', :action => '/search' }
test/unit/dates_helper_test.rb
  Diff comments   View file @9a80f26
@@ -38,6 +38,15 @@ class DatesHelperTest < Test::Unit::TestCase @@ -38,6 +38,15 @@ class DatesHelperTest < Test::Unit::TestCase
38 assert_equal 'January 2008', show_month(2008, 1) 38 assert_equal 'January 2008', show_month(2008, 1)
39 end 39 end
40 40
  41 + should 'fallback to current year/month in show_month' do
  42 + Date.expects(:today).returns(Date.new(2008,11,1)).at_least_once
  43 +
  44 + expects(:_).with('November').returns('November').at_least_once
  45 + expects(:_).with('%{month} %{year}').returns('%{month} %{year}').at_least_once
  46 + assert_equal 'November 2008', show_month(nil, nil)
  47 + assert_equal 'November 2008', show_month('', '')
  48 + end
  49 +
41 should 'provide link to previous month' do 50 should 'provide link to previous month' do
42 expects(:link_to).with('← January 2008', { :year => 2008, :month => 1}) 51 expects(:link_to).with('← January 2008', { :year => 2008, :month => 1})
43 link_to_previous_month('2008', '2') 52 link_to_previous_month('2008', '2')