diff test/unit/helpers/timelog_helper_test.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)
author Chris Cannam
date Fri, 24 Feb 2012 19:09:32 +0000
parents 8661b858af72
children 433d4f72a19b
line wrap: on
line diff
--- a/test/unit/helpers/timelog_helper_test.rb	Fri Feb 24 18:36:29 2012 +0000
+++ b/test/unit/helpers/timelog_helper_test.rb	Fri Feb 24 19:09:32 2012 +0000
@@ -1,35 +1,35 @@
 # Redmine - project management software
-# Copyright (C) 2006-2009  Jean-Philippe Lang
+# Copyright (C) 2006-2011  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 < HelperTestCase
+class TimelogHelperTest < ActionView::TestCase
   include TimelogHelper
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::DateHelper
-  
+
   fixtures :projects, :roles, :enabled_modules, :users,
-                      :repositories, :changesets, 
+                      :repositories, :changesets,
                       :trackers, :issue_statuses, :issues, :versions, :documents,
                       :wikis, :wiki_pages, :wiki_contents,
                       :boards, :messages,
                       :attachments,
                       :enumerations
-  
+
   def setup
     super
   end
@@ -39,7 +39,7 @@
     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])