Download as
Browse Code »

Commit 52ed533cbbee0104cb08fa398930815d6ecce375

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent db028c22
Exists in event_fixes

event: fix tests related to duration of event 

(cherry picked from commit c153ab2b9d57d21a8f7a6dee51bd37e419099efd)
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 @52ed533
@@ -47,14 +47,14 @@ class HomeControllerTest < ActionController::TestCase @@ -47,14 +47,14 @@ class HomeControllerTest < ActionController::TestCase
47 @e1a.end_date = DateTime.now + 1.day 47 @e1a.end_date = DateTime.now + 1.day
48 @e1a.save! 48 @e1a.save!
49 get :index 49 get :index
50 - assert_select ev + 'time.duration[itemprop="endDate"]', /1 day/ 50 + assert_select ev + 'time.duration[itemprop="endDate"]', /2 days/
51 51
52 @e1a.slug = 'event1a' 52 @e1a.slug = 'event1a'
53 @e1a.start_date = DateTime.now 53 @e1a.start_date = DateTime.now
54 @e1a.end_date = DateTime.now + 2.day 54 @e1a.end_date = DateTime.now + 2.day
55 @e1a.save! 55 @e1a.save!
56 get :index 56 get :index
57 - assert_select ev + 'time.duration[itemprop="endDate"]', /2 days/ 57 + assert_select ev + 'time.duration[itemprop="endDate"]', /3 days/
58 end 58 end
59 59
60 should 'not see event duration for one day events' do 60 should 'not see event duration for one day events' do
plugins/event/views/event_plugin/event_block_item.html.erb
  Diff comments   View file @52ed533
1 <% 1 <%
2 # compute layout values 2 # compute layout values
3 ev_days_tag = '' 3 ev_days_tag = ''
4 - if event.duration > 0 4 + if event.duration > 1
5 ev_days_tag = content_tag('time', 5 ev_days_tag = content_tag('time',
6 n_('Duration: 1 day', 'Duration: %s days', event.duration) % "<b>#{event.duration}</b>", 6 n_('Duration: 1 day', 'Duration: %s days', event.duration) % "<b>#{event.duration}</b>",
7 :itemprop => 'endDate', 7 :itemprop => 'endDate',