diff test/functional/time_entry_reports_controller_test.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/test/functional/time_entry_reports_controller_test.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/test/functional/time_entry_reports_controller_test.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -23,7 +23,9 @@
 
   fixtures :projects, :enabled_modules, :roles, :members, :member_roles,
            :issues, :time_entries, :users, :trackers, :enumerations,
-           :issue_statuses, :custom_fields, :custom_values
+           :issue_statuses, :custom_fields, :custom_values,
+           :projects_trackers, :custom_fields_trackers,
+           :custom_fields_projects
 
   include Redmine::I18n
 
@@ -97,7 +99,7 @@
     assert_equal "162.90", "%.2f" % assigns(:report).total_hours
   end
 
-  def test_report_custom_field_criteria_with_multiple_values
+  def test_report_custom_field_criteria_with_multiple_values_on_single_value_custom_field_should_not_fail
     field = TimeEntryCustomField.create!(:name => 'multi', :field_format => 'list', :possible_values => ['value1', 'value2'])
     entry = TimeEntry.create!(:project => Project.find(1), :hours => 1, :activity_id => 10, :user => User.find(2), :spent_on => Date.today)
     CustomValue.create!(:customized => entry, :custom_field => field, :value => 'value1')
@@ -107,6 +109,18 @@
     assert_response :success
   end
 
+  def test_report_multiple_values_custom_fields_should_not_be_proposed
+    TimeEntryCustomField.create!(:name => 'Single', :field_format => 'list', :possible_values => ['value1', 'value2'])
+    TimeEntryCustomField.create!(:name => 'Multi', :field_format => 'list', :multiple => true, :possible_values => ['value1', 'value2'])
+
+    get :report, :project_id => 1
+    assert_response :success
+    assert_select 'select[name=?]', 'criteria[]' do
+      assert_select 'option', :text => 'Single'
+      assert_select 'option', :text => 'Multi', :count => 0
+    end
+  end
+
   def test_report_one_day
     get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criteria => ["user", "activity"]
     assert_response :success