Commit 5d53c7f7 authored by jplang's avatar jplang
Browse files

Upgrade to Rails 3.2.15.

git-svn-id: https://svn.redmine.org/redmine/trunk@12246 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 03a8468d
source 'https://rubygems.org'
gem "rails", "3.2.13"
gem "rails", "3.2.15"
gem "jquery-rails", "~> 2.0.2"
gem "coderay", "~> 1.1.0"
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
......
......@@ -105,12 +105,12 @@ class Redmine::I18nTest < ActiveSupport::TestCase
now = Time.parse('2011-02-20 15:45:22')
with_settings :time_format => '' do
with_settings :date_format => '' do
assert_equal '02/20/2011 03:45 pm', format_time(now)
assert_equal '03:45 pm', format_time(now, false)
assert_equal '02/20/2011 03:45 PM', format_time(now)
assert_equal '03:45 PM', format_time(now, false)
end
with_settings :date_format => '%Y-%m-%d' do
assert_equal '2011-02-20 03:45 pm', format_time(now)
assert_equal '03:45 pm', format_time(now, false)
assert_equal '2011-02-20 03:45 PM', format_time(now)
assert_equal '03:45 PM', format_time(now, false)
end
end
end
......
......@@ -105,6 +105,7 @@ class ProjectMembersInheritanceTest < ActiveSupport::TestCase
def test_moving_a_subproject_to_another_parent_should_change_inherited_members
other_parent = Project.generate!
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 = Project.order('id desc').first
......@@ -157,6 +158,7 @@ class ProjectMembersInheritanceTest < ActiveSupport::TestCase
assert_difference 'Member.count', 2 do
member = Member.create!(:principal => User.find(4), :project => @parent, :role_ids => [1, 3])
member.reload
inherited_member = project.memberships.order('id desc').first
assert_equal member.principal, inherited_member.principal
......@@ -195,6 +197,7 @@ class ProjectMembersInheritanceTest < ActiveSupport::TestCase
assert_difference 'MemberRole.count', 8 do
member = Member.create!(:principal => group, :project => @parent, :role_ids => [1, 3])
project.reload
member.reload
inherited_group_member = project.memberships.detect {|m| m.principal == group}
assert_not_nil inherited_group_member
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment