noosfero | Fix link on agenda for a specific day

Daniela Feitosa gitlab at gitlab.com
Fri Feb 13 08:48:27 BRST 2015


Daniela Feitosa pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>

Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/942507cf8d2aa74a4e445aa6a583cbb26c2ece3f">942507cf</a> by Daniela Feitosa
Fix link on agenda for a specific day

- - - - -


Changes:

=====================================
app/views/events/_month.html.erb
=====================================
--- a/app/views/events/_month.html.erb
+++ b/app/views/events/_month.html.erb
@@ -13,8 +13,8 @@
                 date.day,
                 :url => {:action => 'events_by_day', :year => date.year, :month => date.month, :day => date.day, :category_id => @category_id},
                 :update => 'events-of-the-day',
-                :loading => 'jQuery("#events-of-the-day").addClass("loading")',
-                :complete => 'jQuery("#events-of-the-day").removeClass("loading")'
+                :loading => "jQuery('#events-of-the-day').addClass('loading')",
+                :complete => "jQuery('#events-of-the-day').removeClass('loading')"
               ) :
               date.day
             %>

=====================================
features/events.feature
=====================================
--- a/features/events.feature
+++ b/features/events.feature
@@ -9,6 +9,7 @@ Feature: events
     And the following events
       | owner     | name               | start_date |
       | josesilva | Another Conference | 2009-10-24 |
+      | josesilva | Some Conference    | 2009-10-22 |
 
   Scenario: go to next month
     Given I am on /profile/josesilva/events/2009/10
@@ -114,9 +115,11 @@ Feature: events
   @selenium
   Scenario: show events when i follow a specific day
     Given I am on /profile/josesilva/events/2009/10
-    And I should see "Another Conference"
+    And I should see "Another Conference" within "#agenda"
+    And I should see "Some Conference" within "#agenda"
     When I follow "24"
-    Then I should see "Another Conference"
+    Then I should see "Another Conference" within "#agenda"
+    And I should not see "Some Conference" within "#agenda"
 
   @selenium
   Scenario: show events in a range when i follow a specific day

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150213/66a3c15b/attachment.html>


More information about the Noosfero-dev mailing list