Download as
Browse Code »

Commit aa514668c4c532dc8c91b709d9529786287a764f

Authored by Victor Costa
2 parents 8419a785 726cd88c
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Merge branch 'master' into production

Showing 3 changed files with 13 additions and 0 deletions   Show diff stats
app/views/tasks/_task.html.erb
  Diff comments   View file @aa51466
@@ -32,6 +32,8 @@ @@ -32,6 +32,8 @@
32 %> 32 %>
33 </div><!-- class="task_decisions" --> 33 </div><!-- class="task_decisions" -->
34 34
  35 + <div class="task_date"><%= show_time(task.created_at) %></div>
  36 +
35 <%= render :partial => 'task_title', :locals => {:task => task} %> 37 <%= render :partial => 'task_title', :locals => {:task => task} %>
36 38
37 <div class="task_information"> 39 <div class="task_information">
public/stylesheets/tasks.css
  Diff comments   View file @aa51466
@@ -17,6 +17,11 @@ @@ -17,6 +17,11 @@
17 font-size: 120%; 17 font-size: 120%;
18 } 18 }
19 19
  20 +.task_date {
  21 + color: gray;
  22 + font-size: 12px;
  23 +}
  24 +
20 .task_icon { 25 .task_icon {
21 float: left; 26 float: left;
22 margin-right: 10px; 27 margin-right: 10px;
test/functional/tasks_controller_test.rb
  Diff comments   View file @aa51466
@@ -80,6 +80,12 @@ class TasksControllerTest &lt; ActionController::TestCase @@ -80,6 +80,12 @@ class TasksControllerTest &lt; ActionController::TestCase
80 assert_kind_of Array, assigns(:tasks) 80 assert_kind_of Array, assigns(:tasks)
81 end 81 end
82 82
  83 + should 'display task created_at' do
  84 + Task.create!(:requestor => fast_create(Person), :target => profile, :spam => false)
  85 + get :index
  86 + assert_select '.task_date'
  87 + end
  88 +
83 should 'list processed tasks without spam' do 89 should 'list processed tasks without spam' do
84 requestor = fast_create(Person) 90 requestor = fast_create(Person)
85 task_spam = create(Task, :status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => true) 91 task_spam = create(Task, :status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => true)