##// END OF EJS Templates
jro_apps » redmine
RSS
scm: mercurial: add instance value flag of whether "hg diff -c" supports at tests (#7518)....
Toshi MARUYAMA -
r4733:671b16f89884
parent child
Show More
Side by Side Unified
Context file:
r4733:671b16f89884 Loading diff...:
Show file before | Show file after | Hide comments
@@ -34,6 +34,7 class RepositoriesMercurialControllerTest < ActionController::TestCase
34 User.current = nil
34 User.current = nil
35 @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
35 @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
36 assert @repository
36 assert @repository
37 @diff_c_support = @repository.scm.class.client_version_above?([1, 2])
37 end
38 end
38
39
39 if File.directory?(REPOSITORY_PATH)
40 if File.directory?(REPOSITORY_PATH)
@@ -137,7 +138,7 class RepositoriesMercurialControllerTest < ActionController::TestCase
137 assert_response :success
138 assert_response :success
138 assert_template 'diff'
139 assert_template 'diff'
139
140
140 if @repository.scm.class.client_version_above?([1, 2])
141 if @diff_c_support
141 # Line 22 removed
142 # Line 22 removed
142 assert_tag :tag => 'th',
143 assert_tag :tag => 'th',
143 :content => '22',
144 :content => '22',
Show file before | Show file after | Hide comments
@@ -13,6 +13,7 begin
13 if File.directory?(REPOSITORY_PATH)
13 if File.directory?(REPOSITORY_PATH)
14 def setup
14 def setup
15 @adapter = Redmine::Scm::Adapters::MercurialAdapter.new(REPOSITORY_PATH)
15 @adapter = Redmine::Scm::Adapters::MercurialAdapter.new(REPOSITORY_PATH)
16 @diff_c_support = @adapter.class.client_version_above?([1, 2])
16 end
17 end
17
18
18 def test_hgversion
19 def test_hgversion
@@ -73,7 +74,7 begin
73 assert_nil @adapter.diff(nil, '100000', '200000')
74 assert_nil @adapter.diff(nil, '100000', '200000')
74 [2, '400bb8672109', '400', 400].each do |r1|
75 [2, '400bb8672109', '400', 400].each do |r1|
75 diff1 = @adapter.diff(nil, r1)
76 diff1 = @adapter.diff(nil, r1)
76 if @adapter.class.client_version_above?([1, 2])
77 if @diff_c_support
77 assert_equal 28, diff1.size
78 assert_equal 28, diff1.size
78 buf = diff1[24].gsub(/\r\n|\r|\n/, "")
79 buf = diff1[24].gsub(/\r\n|\r|\n/, "")
79 assert_equal "+ return true unless klass.respond_to?('watched_by')", buf
80 assert_equal "+ return true unless klass.respond_to?('watched_by')", buf
@@ -94,7 +95,7 begin
94 end
95 end
95
96
96 def test_diff_made_by_revision
97 def test_diff_made_by_revision
97 if @adapter.class.client_version_above?([1, 2])
98 if @diff_c_support
98 [16, '16', '4cddb4e45f52'].each do |r1|
99 [16, '16', '4cddb4e45f52'].each do |r1|
99 diff1 = @adapter.diff(nil, r1)
100 diff1 = @adapter.diff(nil, r1)
100 assert_equal 5, diff1.size
101 assert_equal 5, diff1.size
General Comments 0
You need to be logged in to leave comments. Login now