##// END OF EJS Templates
jro_apps » redmine
RSS
Upgrade to Rails 3.2.15....
Jean-Philippe Lang -
r12016:3661766edc1b
parent child
Show More
Side by Side Unified
Context file:
r12016:3661766edc1b Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 source 'https://rubygems.org'
1 source 'https://rubygems.org'
2
2
3 gem "rails", "3.2.13"
3 gem "rails", "3.2.15"
4 gem "jquery-rails", "~> 2.0.2"
4 gem "jquery-rails", "~> 2.0.2"
5 gem "coderay", "~> 1.1.0"
5 gem "coderay", "~> 1.1.0"
6 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
6 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
Show file before | Show file after | Hide comments
@@ -105,12 +105,12 class Redmine::I18nTest < ActiveSupport::TestCase
105 now = Time.parse('2011-02-20 15:45:22')
105 now = Time.parse('2011-02-20 15:45:22')
106 with_settings :time_format => '' do
106 with_settings :time_format => '' do
107 with_settings :date_format => '' do
107 with_settings :date_format => '' do
108 assert_equal '02/20/2011 03:45 pm', format_time(now)
108 assert_equal '02/20/2011 03:45 PM', format_time(now)
109 assert_equal '03:45 pm', format_time(now, false)
109 assert_equal '03:45 PM', format_time(now, false)
110 end
110 end
111 with_settings :date_format => '%Y-%m-%d' do
111 with_settings :date_format => '%Y-%m-%d' do
112 assert_equal '2011-02-20 03:45 pm', format_time(now)
112 assert_equal '2011-02-20 03:45 PM', format_time(now)
113 assert_equal '03:45 pm', format_time(now, false)
113 assert_equal '03:45 PM', format_time(now, false)
114 end
114 end
115 end
115 end
116 end
116 end
Show file before | Show file after | Hide comments
@@ -105,6 +105,7 class ProjectMembersInheritanceTest < ActiveSupport::TestCase
105 def test_moving_a_subproject_to_another_parent_should_change_inherited_members
105 def test_moving_a_subproject_to_another_parent_should_change_inherited_members
106 other_parent = Project.generate!
106 other_parent = Project.generate!
107 other_member = Member.create!(:principal => User.find(4), :project => other_parent, :role_ids => [3])
107 other_member = Member.create!(:principal => User.find(4), :project => other_parent, :role_ids => [3])
108 other_member.reload
108
109
109 Project.generate_with_parent!(@parent, :inherit_members => true)
110 Project.generate_with_parent!(@parent, :inherit_members => true)
110 project = Project.order('id desc').first
111 project = Project.order('id desc').first
@@ -157,6 +158,7 class ProjectMembersInheritanceTest < ActiveSupport::TestCase
157
158
158 assert_difference 'Member.count', 2 do
159 assert_difference 'Member.count', 2 do
159 member = Member.create!(:principal => User.find(4), :project => @parent, :role_ids => [1, 3])
160 member = Member.create!(:principal => User.find(4), :project => @parent, :role_ids => [1, 3])
161 member.reload
160
162
161 inherited_member = project.memberships.order('id desc').first
163 inherited_member = project.memberships.order('id desc').first
162 assert_equal member.principal, inherited_member.principal
164 assert_equal member.principal, inherited_member.principal
@@ -195,6 +197,7 class ProjectMembersInheritanceTest < ActiveSupport::TestCase
195 assert_difference 'MemberRole.count', 8 do
197 assert_difference 'MemberRole.count', 8 do
196 member = Member.create!(:principal => group, :project => @parent, :role_ids => [1, 3])
198 member = Member.create!(:principal => group, :project => @parent, :role_ids => [1, 3])
197 project.reload
199 project.reload
200 member.reload
198
201
199 inherited_group_member = project.memberships.detect {|m| m.principal == group}
202 inherited_group_member = project.memberships.detect {|m| m.principal == group}
200 assert_not_nil inherited_group_member
203 assert_not_nil inherited_group_member
General Comments 0
You need to be logged in to leave comments. Login now