diff test/functional/.svn/text-base/timelog_controller_test.rb.svn-base @ 37:94944d00e43c

* Update to SVN trunk rev 4411

--- a/test/functional/.svn/text-base/timelog_controller_test.rb.svn-base	Fri Sep 24 14:06:04 2010 +0100
+++ b/test/functional/.svn/text-base/timelog_controller_test.rb.svn-base	Fri Nov 19 13:24:41 2010 +0000
@@ -31,9 +31,9 @@
     @response   = ActionController::TestResponse.new
   end
   
-  def test_get_edit
+  def test_get_new
     @request.session[:user_id] = 3
-    get :edit, :project_id => 1
+    get :new, :project_id => 1
     assert_response :success
     assert_template 'edit'
     # Default activity selected
@@ -41,24 +41,24 @@
                                  :content => 'Development'
   end
   
+  def test_get_new_should_only_show_active_time_entry_activities
+    @request.session[:user_id] = 3
+    get :new, :project_id => 1
+    assert_response :success
+    assert_template 'edit'
+    assert_no_tag :tag => 'option', :content => 'Inactive Activity'
+                                    
+  end
+
   def test_get_edit_existing_time
     @request.session[:user_id] = 2
     get :edit, :id => 2, :project_id => nil
     assert_response :success
     assert_template 'edit'
     # Default activity selected
-    assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/timelog/edit/2' }
+    assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/time_entries/2' }
   end
   
-  def test_get_edit_should_only_show_active_time_entry_activities
-    @request.session[:user_id] = 3
-    get :edit, :project_id => 1
-    assert_response :success
-    assert_template 'edit'
-    assert_no_tag :tag => 'option', :content => 'Inactive Activity'
-                                    
-  end
-
   def test_get_edit_with_an_existing_time_entry_with_inactive_activity
     te = TimeEntry.find(1)
     te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
@@ -72,18 +72,18 @@
     assert_tag :tag => 'option', :content => '--- Please select ---'
   end
   
-  def test_post_edit
+  def test_post_create
     # TODO: should POST to issues’ time log instead of project. change form
     # and routing
     @request.session[:user_id] = 3
-    post :edit, :project_id => 1,
+    post :create, :project_id => 1,
                 :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                 # Not the default activity
                                 :activity_id => '11',
                                 :spent_on => '2008-03-14',
                                 :issue_id => '1',
                                 :hours => '7.3'}
-    assert_redirected_to :action => 'details', :project_id => 'ecookbook'
+    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     
     i = Issue.find(1)
     t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
@@ -101,10 +101,10 @@
     assert_equal 2, entry.user_id
     
     @request.session[:user_id] = 1
-    post :edit, :id => 1,
+    put :update, :id => 1,
                 :time_entry => {:issue_id => '2',
                                 :hours => '8'}
-    assert_redirected_to :action => 'details', :project_id => 'ecookbook'
+    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     entry.reload
     
     assert_equal 8, entry.hours
@@ -114,8 +114,8 @@
   
   def test_destroy
     @request.session[:user_id] = 2
-    post :destroy, :id => 1
-    assert_redirected_to :action => 'details', :project_id => 'ecookbook'
+    delete :destroy, :id => 1
+    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_equal I18n.t(:notice_successful_delete), flash[:notice]
     assert_nil TimeEntry.find_by_id(1)
   end
@@ -128,8 +128,8 @@
     end
 
     @request.session[:user_id] = 2
-    post :destroy, :id => 1
-    assert_redirected_to :action => 'details', :project_id => 'ecookbook'
+    delete :destroy, :id => 1
+    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_equal I18n.t(:notice_unable_delete_time_entry), flash[:error]
     assert_not_nil TimeEntry.find_by_id(1)
 
@@ -137,145 +137,18 @@
     TimeEntry.before_destroy.reject! {|callback| callback.method == :stop_callback_chain }
   end
   
-  def test_report_no_criteria
-    get :report, :project_id => 1
+  def test_index_all_projects
+    get :index
     assert_response :success
-    assert_template 'report'
-  end
-  
-  def test_report_all_projects
-    get :report
-    assert_response :success
-    assert_template 'report'
-  end
-  
-  def test_report_all_projects_denied
-    r = Role.anonymous
-    r.permissions.delete(:view_time_entries)
-    r.permissions_will_change!
-    r.save
-    get :report
-    assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Ftime_entries%2Freport'
-  end
-  
-  def test_report_all_projects_one_criteria
-    get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
-    assert_response :success
-    assert_template 'report'
-    assert_not_nil assigns(:total_hours)
-    assert_equal "8.65", "%.2f" % assigns(:total_hours)
-  end
-
-  def test_report_all_time
-    get :report, :project_id => 1, :criterias => ['project', 'issue']
-    assert_response :success
-    assert_template 'report'
-    assert_not_nil assigns(:total_hours)
-    assert_equal "162.90", "%.2f" % assigns(:total_hours)
-  end
-
-  def test_report_all_time_by_day
-    get :report, :project_id => 1, :criterias => ['project', 'issue'], :columns => 'day'
-    assert_response :success
-    assert_template 'report'
-    assert_not_nil assigns(:total_hours)
-    assert_equal "162.90", "%.2f" % assigns(:total_hours)
-    assert_tag :tag => 'th', :content => '2007-03-12'
-  end
-  
-  def test_report_one_criteria
-    get :report, :project_id => 1, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
-    assert_response :success
-    assert_template 'report'
-    assert_not_nil assigns(:total_hours)
-    assert_equal "8.65", "%.2f" % assigns(:total_hours)
-  end
-  
-  def test_report_two_criterias
-    get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criterias => ["member", "activity"]
-    assert_response :success
-    assert_template 'report'
+    assert_template 'index'
     assert_not_nil assigns(:total_hours)
     assert_equal "162.90", "%.2f" % assigns(:total_hours)
   end
   
-  def test_report_one_day
-    get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criterias => ["member", "activity"]
+  def test_index_at_project_level
+    get :index, :project_id => 1
     assert_response :success
-    assert_template 'report'
-    assert_not_nil assigns(:total_hours)
-    assert_equal "4.25", "%.2f" % assigns(:total_hours)
-  end
-  
-  def test_report_at_issue_level
-    get :report, :project_id => 1, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criterias => ["member", "activity"]
-    assert_response :success
-    assert_template 'report'
-    assert_not_nil assigns(:total_hours)
-    assert_equal "154.25", "%.2f" % assigns(:total_hours)
-  end
-  
-  def test_report_custom_field_criteria
-    get :report, :project_id => 1, :criterias => ['project', 'cf_1', 'cf_7']
-    assert_response :success
-    assert_template 'report'
-    assert_not_nil assigns(:total_hours)
-    assert_not_nil assigns(:criterias)
-    assert_equal 3, assigns(:criterias).size
-    assert_equal "162.90", "%.2f" % assigns(:total_hours)
-    # Custom field column
-    assert_tag :tag => 'th', :content => 'Database'
-    # Custom field row
-    assert_tag :tag => 'td', :content => 'MySQL',
-                             :sibling => { :tag => 'td', :attributes => { :class => 'hours' },
-                                                         :child => { :tag => 'span', :attributes => { :class => 'hours hours-int' },
-                                                                                     :content => '1' }}
-    # Second custom field column
-    assert_tag :tag => 'th', :content => 'Billable'
-  end
-  
-  def test_report_one_criteria_no_result
-    get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criterias => ['project']
-    assert_response :success
-    assert_template 'report'
-    assert_not_nil assigns(:total_hours)
-    assert_equal "0.00", "%.2f" % assigns(:total_hours)
-  end
-  
-  def test_report_all_projects_csv_export
-    get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
-    assert_response :success
-    assert_equal 'text/csv', @response.content_type
-    lines = @response.body.chomp.split("\n")
-    # Headers
-    assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total', lines.first
-    # Total row
-    assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
-  end
-  
-  def test_report_csv_export
-    get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
-    assert_response :success
-    assert_equal 'text/csv', @response.content_type
-    lines = @response.body.chomp.split("\n")
-    # Headers
-    assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total', lines.first
-    # Total row
-    assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
-  end
-  
-  def test_details_all_projects
-    get :details
-    assert_response :success
-    assert_template 'details'
-    assert_not_nil assigns(:total_hours)
-    assert_equal "162.90", "%.2f" % assigns(:total_hours)
-  end
-  
-  def test_details_at_project_level
-    get :details, :project_id => 1
-    assert_response :success
-    assert_template 'details'
+    assert_template 'index'
     assert_not_nil assigns(:entries)
     assert_equal 4, assigns(:entries).size
     # project and subproject
@@ -287,10 +160,10 @@
     assert_equal '2007-04-22'.to_date, assigns(:to)
   end
   
-  def test_details_at_project_level_with_date_range
-    get :details, :project_id => 1, :from => '2007-03-20', :to => '2007-04-30'
+  def test_index_at_project_level_with_date_range
+    get :index, :project_id => 1, :from => '2007-03-20', :to => '2007-04-30'
     assert_response :success
-    assert_template 'details'
+    assert_template 'index'
     assert_not_nil assigns(:entries)
     assert_equal 3, assigns(:entries).size
     assert_not_nil assigns(:total_hours)
@@ -299,28 +172,28 @@
     assert_equal '2007-04-30'.to_date, assigns(:to)
   end
 
-  def test_details_at_project_level_with_period
-    get :details, :project_id => 1, :period => '7_days'
+  def test_index_at_project_level_with_period
+    get :index, :project_id => 1, :period => '7_days'
     assert_response :success
-    assert_template 'details'
+    assert_template 'index'
     assert_not_nil assigns(:entries)
     assert_not_nil assigns(:total_hours)
     assert_equal Date.today - 7, assigns(:from)
     assert_equal Date.today, assigns(:to)
   end
 
-  def test_details_one_day
-    get :details, :project_id => 1, :from => "2007-03-23", :to => "2007-03-23"
+  def test_index_one_day
+    get :index, :project_id => 1, :from => "2007-03-23", :to => "2007-03-23"
     assert_response :success
-    assert_template 'details'
+    assert_template 'index'
     assert_not_nil assigns(:total_hours)
     assert_equal "4.25", "%.2f" % assigns(:total_hours)
   end
   
-  def test_details_at_issue_level
-    get :details, :issue_id => 1
+  def test_index_at_issue_level
+    get :index, :issue_id => 1
     assert_response :success
-    assert_template 'details'
+    assert_template 'index'
     assert_not_nil assigns(:entries)
     assert_equal 2, assigns(:entries).size
     assert_not_nil assigns(:total_hours)
@@ -330,26 +203,26 @@
     assert_equal '2007-04-22'.to_date, assigns(:to)
   end
   
-  def test_details_atom_feed
-    get :details, :project_id => 1, :format => 'atom'
+  def test_index_atom_feed
+    get :index, :project_id => 1, :format => 'atom'
     assert_response :success
     assert_equal 'application/atom+xml', @response.content_type
     assert_not_nil assigns(:items)
     assert assigns(:items).first.is_a?(TimeEntry)
   end
   
-  def test_details_all_projects_csv_export
+  def test_index_all_projects_csv_export
     Setting.date_format = '%m/%d/%Y'
-    get :details, :format => 'csv'
+    get :index, :format => 'csv'
     assert_response :success
     assert_equal 'text/csv', @response.content_type
     assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
     assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
   end
   
-  def test_details_csv_export
+  def test_index_csv_export
     Setting.date_format = '%m/%d/%Y'
-    get :details, :project_id => 1, :format => 'csv'
+    get :index, :project_id => 1, :format => 'csv'
     assert_response :success
     assert_equal 'text/csv', @response.content_type
     assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")