From 52ed533cbbee0104cb08fa398930815d6ecce375 Mon Sep 17 00:00:00 2001 From: Daniela Feitosa Date: Fri, 20 Nov 2015 18:07:12 +0000 Subject: [PATCH] event: fix tests related to duration of event --- plugins/event/test/functional/event_block_test.rb | 4 ++-- plugins/event/views/event_plugin/event_block_item.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/event/test/functional/event_block_test.rb b/plugins/event/test/functional/event_block_test.rb index 9f50b9a..5a9d331 100644 --- a/plugins/event/test/functional/event_block_test.rb +++ b/plugins/event/test/functional/event_block_test.rb @@ -47,14 +47,14 @@ class HomeControllerTest < ActionController::TestCase @e1a.end_date = DateTime.now + 1.day @e1a.save! get :index - assert_select ev + 'time.duration[itemprop="endDate"]', /1 day/ + assert_select ev + 'time.duration[itemprop="endDate"]', /2 days/ @e1a.slug = 'event1a' @e1a.start_date = DateTime.now @e1a.end_date = DateTime.now + 2.day @e1a.save! get :index - assert_select ev + 'time.duration[itemprop="endDate"]', /2 days/ + assert_select ev + 'time.duration[itemprop="endDate"]', /3 days/ end should 'not see event duration for one day events' do diff --git a/plugins/event/views/event_plugin/event_block_item.html.erb b/plugins/event/views/event_plugin/event_block_item.html.erb index f55a246..d86693a 100644 --- a/plugins/event/views/event_plugin/event_block_item.html.erb +++ b/plugins/event/views/event_plugin/event_block_item.html.erb @@ -1,7 +1,7 @@ <% # compute layout values ev_days_tag = '' - if event.duration > 0 + if event.duration > 1 ev_days_tag = content_tag('time', n_('Duration: 1 day', 'Duration: %s days', event.duration) % "#{event.duration}", :itemprop => 'endDate', -- libgit2 0.21.2