Download as
Browse Code »

Commit 942507cf8d2aa74a4e445aa6a583cbb26c2ece3f

Authored by Daniela Feitosa
1 parent 6fcf788e
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

Fix link on agenda for a specific day

Showing 2 changed files with 7 additions and 4 deletions   Show diff stats
app/views/events/_month.html.erb
  Diff comments   View file @942507c
... ... @@ -13,8 +13,8 @@
13 13 date.day,
14 14 :url => {:action => 'events_by_day', :year => date.year, :month => date.month, :day => date.day, :category_id => @category_id},
15 15 :update => 'events-of-the-day',
16   - :loading => 'jQuery("#events-of-the-day").addClass("loading")',
17   - :complete => 'jQuery("#events-of-the-day").removeClass("loading")'
  16 + :loading => "jQuery('#events-of-the-day').addClass('loading')",
  17 + :complete => "jQuery('#events-of-the-day').removeClass('loading')"
18 18 ) :
19 19 date.day
20 20 %>
... ...
features/events.feature
  Diff comments   View file @942507c
... ... @@ -9,6 +9,7 @@ Feature: events
9 9 And the following events
10 10 | owner | name | start_date |
11 11 | josesilva | Another Conference | 2009-10-24 |
  12 + | josesilva | Some Conference | 2009-10-22 |
12 13  
13 14 Scenario: go to next month
14 15 Given I am on /profile/josesilva/events/2009/10
... ... @@ -114,9 +115,11 @@ Feature: events
114 115 @selenium
115 116 Scenario: show events when i follow a specific day
116 117 Given I am on /profile/josesilva/events/2009/10
117   - And I should see "Another Conference"
  118 + And I should see "Another Conference" within "#agenda"
  119 + And I should see "Some Conference" within "#agenda"
118 120 When I follow "24"
119   - Then I should see "Another Conference"
  121 + Then I should see "Another Conference" within "#agenda"
  122 + And I should not see "Some Conference" within "#agenda"
120 123  
121 124 @selenium
122 125 Scenario: show events in a range when i follow a specific day
... ...