diff test/functional/activities_controller_test.rb @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/test/functional/activities_controller_test.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/test/functional/activities_controller_test.rb	Thu Jul 14 10:43:07 2011 +0100
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class ActivitiesControllerTest < ActionController::TestCase
   fixtures :all
@@ -8,8 +8,8 @@
     assert_response :success
     assert_template 'index'
     assert_not_nil assigns(:events_by_day)
-    
-    assert_tag :tag => "h3", 
+
+    assert_tag :tag => "h3",
                :content => /#{2.days.ago.to_date.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
@@ -20,14 +20,14 @@
                  }
                }
   end
-  
+
   def test_previous_project_index
     get :index, :id => 1, :from => 3.days.ago.to_date
     assert_response :success
     assert_template 'index'
     assert_not_nil assigns(:events_by_day)
-               
-    assert_tag :tag => "h3", 
+
+    assert_tag :tag => "h3",
                :content => /#{3.day.ago.to_date.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
@@ -38,14 +38,14 @@
                  }
                }
   end
-  
+
   def test_global_index
     get :index
     assert_response :success
     assert_template 'index'
     assert_not_nil assigns(:events_by_day)
-    
-    assert_tag :tag => "h3", 
+
+    assert_tag :tag => "h3",
                :content => /#{5.day.ago.to_date.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
@@ -56,14 +56,14 @@
                  }
                }
   end
-  
+
   def test_user_index
     get :index, :user_id => 2
     assert_response :success
     assert_template 'index'
     assert_not_nil assigns(:events_by_day)
-    
-    assert_tag :tag => "h3", 
+
+    assert_tag :tag => "h3",
                :content => /#{3.day.ago.to_date.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
@@ -74,7 +74,7 @@
                  }
                }
   end
-  
+
   def test_index_atom_feed
     get :index, :format => 'atom'
     assert_response :success
@@ -83,5 +83,4 @@
       :tag => 'link',
       :attributes => {:href => 'http://test.host/issues/11'}}
   end
-  
 end