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

Merge from branch "cannam"

--- a/test/functional/repositories_controller_test.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/test/functional/repositories_controller_test.rb	Thu Jul 14 10:43:07 2011 +0100
@@ -15,22 +15,24 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 require 'repositories_controller'
 
 # Re-raise errors caught by the controller.
 class RepositoriesController; def rescue_action(e) raise e end; end
 
 class RepositoriesControllerTest < ActionController::TestCase
-  fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
-  
+  fixtures :projects, :users, :roles, :members, :member_roles,
+           :repositories, :issues, :issue_statuses, :changesets, :changes,
+           :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
+
   def setup
     @controller = RepositoriesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     User.current = nil
   end
-  
+
   def test_revisions
     get :revisions, :id => 1
     assert_response :success
@@ -44,7 +46,7 @@
     assert_not_nil assigns(:changeset)
     assert_equal "1", assigns(:changeset).revision
   end
-  
+
   def test_revision_with_before_nil_and_afer_normal
     get :revision, {:id => 1, :rev => 1}
     assert_response :success
@@ -56,24 +58,30 @@
         :child => { :tag => "a", :attributes => { :href => '/projects/ecookbook/repository/revisions/2'}
     }
   end
-  
+
   def test_graph_commits_per_month
     get :graph, :id => 1, :graph => 'commits_per_month'
     assert_response :success
     assert_equal 'image/svg+xml', @response.content_type
   end
-  
+
   def test_graph_commits_per_author
     get :graph, :id => 1, :graph => 'commits_per_author'
     assert_response :success
     assert_equal 'image/svg+xml', @response.content_type
   end
-  
+
   def test_committers
     @request.session[:user_id] = 2
     # add a commit with an unknown user
-    Changeset.create!(:repository => Project.find(1).repository, :committer => 'foo', :committed_on => Time.now, :revision => 100, :comments => 'Committed by foo.')
-    
+    Changeset.create!(
+        :repository => Project.find(1).repository,
+        :committer  => 'foo',
+        :committed_on => Time.now,
+        :revision => 100,
+        :comments => 'Committed by foo.'
+     )
+
     get :committers, :id => 1
     assert_response :success
     assert_template 'committers'
@@ -94,8 +102,13 @@
   def test_map_committers
     @request.session[:user_id] = 2
     # add a commit with an unknown user
-    c = Changeset.create!(:repository => Project.find(1).repository, :committer => 'foo', :committed_on => Time.now, :revision => 100, :comments => 'Committed by foo.')
-    
+    c = Changeset.create!(
+            :repository => Project.find(1).repository,
+            :committer  => 'foo',
+            :committed_on => Time.now,
+            :revision => 100,
+            :comments => 'Committed by foo.'
+          )
     assert_no_difference "Changeset.count(:conditions => 'user_id = 3')" do
       post :committers, :id => 1, :committers => { '0' => ['foo', '2'], '1' => ['dlopper', '3']}
       assert_redirected_to '/projects/ecookbook/repository/committers'