##// END OF EJS Templates
Merged r9786 from trunk....
Jean-Philippe Lang -
r9605:fcbb8acdb715
parent child
Show More
@@ -1,4 +1,4
1 <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></h2>
1 <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2>
2 <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p>
2 <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p>
3
3
4 <div id="activity">
4 <div id="activity">
@@ -78,6 +78,8 class ActivitiesControllerTest < ActionController::TestCase
78 assert_template 'index'
78 assert_template 'index'
79 assert_not_nil assigns(:events_by_day)
79 assert_not_nil assigns(:events_by_day)
80
80
81 assert_select 'h2 a[href=/users/2]', :text => 'John Smith'
82
81 assert_tag :tag => "h3",
83 assert_tag :tag => "h3",
82 :content => /#{3.day.ago.to_date.day}/,
84 :content => /#{3.day.ago.to_date.day}/,
83 :sibling => { :tag => "dl",
85 :sibling => { :tag => "dl",
General Comments 0
You need to be logged in to leave comments. Login now