Download as
Browse Code »

Commit c153ab2b9d57d21a8f7a6dee51bd37e419099efd

Authored by Daniela Feitosa
1 parent 0d4fa8fa
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

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,14 +38,14 @@ class HomeControllerTest < ActionController::TestCase
38 @e1a.end_date = DateTime.now + 1.day 38 @e1a.end_date = DateTime.now + 1.day
39 @e1a.save! 39 @e1a.save!
40 get :index 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 @e1a.slug = 'event1a' 43 @e1a.slug = 'event1a'
44 @e1a.start_date = DateTime.now 44 @e1a.start_date = DateTime.now
45 @e1a.end_date = DateTime.now + 2.day 45 @e1a.end_date = DateTime.now + 2.day
46 @e1a.save! 46 @e1a.save!
47 get :index 47 get :index
48 - assert_select ev + 'time.duration[itemprop="endDate"]', /2 days/ 48 + assert_select ev + 'time.duration[itemprop="endDate"]', /3 days/
49 end 49 end
50 50
51 should 'not see event duration for one day events' do 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 # 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',