kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade to Rails 3.2.15. 

git-svn-id: http://svn.redmine.org/redmine/trunk@12246 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-11-09 07:51:00 +00:00
parent 71b43ea1c7
commit 3661766edc
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem "rails", "3.2.13" gem "rails", "3.2.15"
gem "jquery-rails", "~> 2.0.2" gem "jquery-rails", "~> 2.0.2"
gem "coderay", "~> 1.1.0" gem "coderay", "~> 1.1.0"
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]

8
test/unit/lib/redmine/i18n_test.rb
View File

@ -105,12 +105,12 @@ class Redmine::I18nTest < ActiveSupport::TestCase
now = Time.parse('2011-02-20 15:45:22') now = Time.parse('2011-02-20 15:45:22')
with_settings :time_format => '' do with_settings :time_format => '' do
with_settings :date_format => '' do with_settings :date_format => '' do
assert_equal '02/20/2011 03:45 pm', format_time(now) assert_equal '02/20/2011 03:45 PM', format_time(now)
assert_equal '03:45 pm', format_time(now, false) assert_equal '03:45 PM', format_time(now, false)
end end
with_settings :date_format => '%Y-%m-%d' do with_settings :date_format => '%Y-%m-%d' do
assert_equal '2011-02-20 03:45 pm', format_time(now) assert_equal '2011-02-20 03:45 PM', format_time(now)
assert_equal '03:45 pm', format_time(now, false) assert_equal '03:45 PM', format_time(now, false)
end end
end end
end end

3
test/unit/project_members_inheritance_test.rb
View File

@ -105,6 +105,7 @@ class ProjectMembersInheritanceTest < ActiveSupport::TestCase
def test_moving_a_subproject_to_another_parent_should_change_inherited_members def test_moving_a_subproject_to_another_parent_should_change_inherited_members
other_parent = Project.generate! other_parent = Project.generate!
other_member = Member.create!(:principal => User.find(4), :project => other_parent, :role_ids => [3]) other_member = Member.create!(:principal => User.find(4), :project => other_parent, :role_ids => [3])
other_member.reload
Project.generate_with_parent!(@parent, :inherit_members => true) Project.generate_with_parent!(@parent, :inherit_members => true)
project = Project.order('id desc').first project = Project.order('id desc').first
@ -157,6 +158,7 @@ class ProjectMembersInheritanceTest < ActiveSupport::TestCase
assert_difference 'Member.count', 2 do assert_difference 'Member.count', 2 do
member = Member.create!(:principal => User.find(4), :project => @parent, :role_ids => [1, 3]) member = Member.create!(:principal => User.find(4), :project => @parent, :role_ids => [1, 3])
member.reload
inherited_member = project.memberships.order('id desc').first inherited_member = project.memberships.order('id desc').first
assert_equal member.principal, inherited_member.principal assert_equal member.principal, inherited_member.principal
@ -195,6 +197,7 @@ class ProjectMembersInheritanceTest < ActiveSupport::TestCase
assert_difference 'MemberRole.count', 8 do assert_difference 'MemberRole.count', 8 do
member = Member.create!(:principal => group, :project => @parent, :role_ids => [1, 3]) member = Member.create!(:principal => group, :project => @parent, :role_ids => [1, 3])
project.reload project.reload
member.reload
inherited_group_member = project.memberships.detect {|m| m.principal == group} inherited_group_member = project.memberships.detect {|m| m.principal == group}
assert_not_nil inherited_group_member assert_not_nil inherited_group_member