1
Download as
Browse Code »

Commit c153ab2b9d57d21a8f7a6dee51bd37e419099efd

Authored by Daniela Feitosa
1 parent 0d4fa8fa
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, 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, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

event: fix tests related to duration of event

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
plugins/event/test/functional/event_block_test.rb
  Diff comments   View file @c153ab2
... ... @@ -38,14 +38,14 @@ class HomeControllerTest < ActionController::TestCase
38 38 @e1a.end_date = DateTime.now + 1.day
39 39 @e1a.save!
40 40 get :index
41   - assert_select ev + 'time.duration[itemprop="endDate"]', /1 day/
  41 + assert_select ev + 'time.duration[itemprop="endDate"]', /2 days/
42 42  
43 43 @e1a.slug = 'event1a'
44 44 @e1a.start_date = DateTime.now
45 45 @e1a.end_date = DateTime.now + 2.day
46 46 @e1a.save!
47 47 get :index
48   - assert_select ev + 'time.duration[itemprop="endDate"]', /2 days/
  48 + assert_select ev + 'time.duration[itemprop="endDate"]', /3 days/
49 49 end
50 50  
51 51 should 'not see event duration for one day events' do
... ...
plugins/event/views/event_plugin/event_block_item.html.erb
  Diff comments   View file @c153ab2
1 1 <%
2 2 # compute layout values
3 3 ev_days_tag = ''
4   - if event.duration > 0
  4 + if event.duration > 1
5 5 ev_days_tag = content_tag('time',
6 6 n_('Duration: 1 day', 'Duration: %s days', event.duration) % "<b>#{event.duration}</b>",
7 7 :itemprop => 'endDate',
... ...