Mercurial > hg > soundsoftware-site
diff test/functional/project_enumerations_controller_test.rb @ 1295:622f24f53b42 redmine-2.3
Update to Redmine SVN revision 11972 on 2.3-stable branch
author | Chris Cannam |
---|---|
date | Fri, 14 Jun 2013 09:02:21 +0100 |
parents | 5f33065ddc4b |
children | 4f746d8966dd e248c7af89ec |
line wrap: on
line diff
--- a/test/functional/project_enumerations_controller_test.rb Fri Jun 14 09:01:12 2013 +0100 +++ b/test/functional/project_enumerations_controller_test.rb Fri Jun 14 09:02:21 2013 +0100 @@ -1,3 +1,20 @@ +# Redmine - project management software +# Copyright (C) 2006-2013 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 ProjectEnumerationsControllerTest < ActionController::TestCase @@ -8,7 +25,6 @@ :member_roles, :members, :enabled_modules, - :workflows, :custom_fields, :custom_fields_projects, :custom_fields_trackers, :custom_values, :time_entries @@ -75,14 +91,14 @@ project_activity = TimeEntryActivity.new({ :name => 'Project Specific', - :parent => TimeEntryActivity.find(:first), + :parent => TimeEntryActivity.first, :project => Project.find(1), :active => true }) assert project_activity.save project_activity_two = TimeEntryActivity.new({ :name => 'Project Specific Two', - :parent => TimeEntryActivity.find(:last), + :parent => TimeEntryActivity.last, :project => Project.find(1), :active => true }) @@ -156,14 +172,14 @@ @request.session[:user_id] = 2 # manager project_activity = TimeEntryActivity.new({ :name => 'Project Specific', - :parent => TimeEntryActivity.find(:first), + :parent => TimeEntryActivity.first, :project => Project.find(1), :active => true }) assert project_activity.save project_activity_two = TimeEntryActivity.new({ :name => 'Project Specific Two', - :parent => TimeEntryActivity.find(:last), + :parent => TimeEntryActivity.last, :project => Project.find(1), :active => true })