[rvm-commits] SF.net SVN: jikesrvm: [13593] cattrack/trunk

[<pet...@us...>]

Revision: 13593
          http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=13593&view=rev
Author:   peter_donald
Date:     2007-09-14 23:47:43 -0700 (Fri, 14 Sep 2007)

Log Message:
-----------
* Remove list of all the historic test runs as they are available from hosts page
* Make sure test passes again

Modified Paths:
--------------
    cattrack/trunk/app/controllers/dashboard_controller.rb
    cattrack/trunk/app/views/dashboard/index.haml
    cattrack/trunk/test/functional/dashboard_controller_test.rb

Modified: cattrack/trunk/app/controllers/dashboard_controller.rb
===================================================================
--- cattrack/trunk/app/controllers/dashboard_controller.rb	2007-09-15 06:33:40 UTC (rev 13592)
+++ cattrack/trunk/app/controllers/dashboard_controller.rb	2007-09-15 06:47:43 UTC (rev 13593)
@@ -15,9 +15,6 @@
   session :off
 
   def index
-    @test_run_pages, @test_runs =
-      paginate(Tdm::TestRun, :per_page => 20, :order => 'start_time DESC')
-
-    @most_recent = Tdm::TestRun.find_recent()
+    @test_runs = Tdm::TestRun.find_recent
   end
 end

Modified: cattrack/trunk/app/views/dashboard/index.haml
===================================================================
--- cattrack/trunk/app/views/dashboard/index.haml	2007-09-15 06:33:40 UTC (rev 13592)
+++ cattrack/trunk/app/views/dashboard/index.haml	2007-09-15 06:47:43 UTC (rev 13593)
@@ -10,25 +10,6 @@
     %th Success Rate
     %th Revision
     %th
-  - @most_recent.each do |t|
-    %tr{:class => cycle('odd','even')}
-      %td= h(t.variant)
-      %td= link_for(t.host)
-      %td= "#{time_ago_in_words(t.start_time)} ago"
-      %td= t.success_rate
-      %td= revision_link(t.revision)
-      %td
-        %ul.actions
-          %li= link_for(t, :label => 'Details', :action => 'show')
-%h2 Full Listing
-%table.list
-  %tr
-    %th Variant
-    %th Host
-    %th Time
-    %th Success Rate
-    %th Revision
-    %th
   - @test_runs.each do |t|
     %tr{:class => cycle('odd','even')}
       %td= h(t.variant)
@@ -39,4 +20,3 @@
       %td
         %ul.actions
           %li= link_for(t, :label => 'Details', :action => 'show')
-= render(:partial => '/common/pagination', :locals => {:record_pages => @test_run_pages})

Modified: cattrack/trunk/test/functional/dashboard_controller_test.rb
===================================================================
--- cattrack/trunk/test/functional/dashboard_controller_test.rb	2007-09-15 06:33:40 UTC (rev 13592)
+++ cattrack/trunk/test/functional/dashboard_controller_test.rb	2007-09-15 06:47:43 UTC (rev 13593)
@@ -28,14 +28,16 @@
   end
 
   def test_index
+    test_run = Tdm::TestRun.find(1)
+    test_run.start_time = Time.now
+    test_run.save!
+    test_run = Tdm::TestRun.find(2)
+    test_run.start_time = Time.now
+    test_run.save!
     get(:index, {}, {:user_id => 1})
-    assert_normal_response('index', 2)
+    assert_normal_response('index', 1)
     assert_assigned(:test_runs)
-    assert_assigned(:test_run_pages)
 
-    assert_equal([2, 1], assigns(:test_runs).collect {|r| r.id} )
-    assert_not_nil(assigns(:test_run_pages))
-    assert_equal(0, assigns(:test_run_pages).current.offset)
-    assert_equal(1, assigns(:test_run_pages).page_count)
+    assert_equal([1, 2], assigns(:test_runs).collect {|r| r.id} )
   end
 end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.