comparison .svn/pristine/d1/d135034b3f55af6d92fe20dfa38d8a5ebacd0d27.svn-base @ 1494:e248c7af89ec redmine-2.4

Update to Redmine SVN revision 12979 on 2.4-stable branch

+# Redmine - project management software
+# Copyright (C) 2006-2014  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# 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.expand_path('../../../test_helper', __FILE__)
+
+class TimelogHelperTest < ActionView::TestCase
+  include TimelogHelper
+  include Redmine::I18n
+  include ActionView::Helpers::TextHelper
+  include ActionView::Helpers::DateHelper
+  include ERB::Util
+
+  fixtures :projects, :roles, :enabled_modules, :users,
+                      :repositories, :changesets,
+                      :trackers, :issue_statuses, :issues, :versions, :documents,
+                      :wikis, :wiki_pages, :wiki_contents,
+                      :boards, :messages,
+                      :attachments,
+                      :enumerations
+
+  def setup
+    super
+  end
+
+  def test_activities_collection_for_select_options_should_return_array_of_activity_names_and_ids
+    activities = activity_collection_for_select_options
+    assert activities.include?(["Design", 9])
+    assert activities.include?(["Development", 10])
+  end
+
+  def test_activities_collection_for_select_options_should_not_include_inactive_activities
+    activities = activity_collection_for_select_options
+    assert !activities.include?(["Inactive Activity", 14])
+  end
+
+  def test_activities_collection_for_select_options_should_use_the_projects_override
+    project = Project.find(1)
+    override_activity = TimeEntryActivity.create!({:name => "Design override", :parent => TimeEntryActivity.find_by_name("Design"), :project => project})
+
+    activities = activity_collection_for_select_options(nil, project)
+    assert !activities.include?(["Design", 9]), "System activity found in: " + activities.inspect
+    assert activities.include?(["Design override", override_activity.id]), "Override activity not found in: " + activities.inspect
+  end
+end