##// END OF EJS Templates
jro_apps » redmine
RSS
use git diff format for all diff (#11868)...
Toshi MARUYAMA -
r10245:f18edc4e1c04
parent child
Show More
Side by Side Unified
Context file:
r10245:f18edc4e1c04 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,279 +1,286
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 module Redmine
19 19 # Class used to parse unified diffs
20 20 class UnifiedDiff < Array
21 21 attr_reader :diff_type, :diff_style
22 22
23 23 def initialize(diff, options={})
24 24 options.assert_valid_keys(:type, :style, :max_lines)
25 25 diff = diff.split("\n") if diff.is_a?(String)
26 26 @diff_type = options[:type] || 'inline'
27 27 @diff_style = options[:style]
28 28 lines = 0
29 29 @truncated = false
30 30 diff_table = DiffTable.new(diff_type, diff_style)
31 31 diff.each do |line|
32 32 line_encoding = nil
33 33 if line.respond_to?(:force_encoding)
34 34 line_encoding = line.encoding
35 35 # TODO: UTF-16 and Japanese CP932 which is imcompatible with ASCII
36 36 # In Japan, diffrence between file path encoding
37 37 # and file contents encoding is popular.
38 38 line.force_encoding('ASCII-8BIT')
39 39 end
40 40 unless diff_table.add_line line
41 41 line.force_encoding(line_encoding) if line_encoding
42 42 self << diff_table if diff_table.length > 0
43 43 diff_table = DiffTable.new(diff_type, diff_style)
44 44 end
45 45 lines += 1
46 46 if options[:max_lines] && lines > options[:max_lines]
47 47 @truncated = true
48 48 break
49 49 end
50 50 end
51 51 self << diff_table unless diff_table.empty?
52 52 self
53 53 end
54 54
55 55 def truncated?; @truncated; end
56 56 end
57 57
58 58 # Class that represents a file diff
59 59 class DiffTable < Array
60 60 attr_reader :file_name
61 61
62 62 # Initialize with a Diff file and the type of Diff View
63 63 # The type view must be inline or sbs (side_by_side)
64 64 def initialize(type="inline", style=nil)
65 65 @parsing = false
66 66 @added = 0
67 67 @removed = 0
68 68 @type = type
69 69 @style = style
70 70 @file_name = nil
71 @git_diff = false
71 72 end
72 73
73 74 # Function for add a line of this Diff
74 75 # Returns false when the diff ends
75 76 def add_line(line)
76 77 unless @parsing
77 78 if line =~ /^(---|\+\+\+) (.*)$/
78 79 self.file_name = $2
79 80 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
80 81 @line_num_l = $2.to_i
81 82 @line_num_r = $5.to_i
82 83 @parsing = true
83 84 end
84 85 else
85 86 if line =~ /^[^\+\-\s@\\]/
86 87 @parsing = false
87 88 return false
88 89 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
89 90 @line_num_l = $2.to_i
90 91 @line_num_r = $5.to_i
91 92 else
92 93 parse_line(line, @type)
93 94 end
94 95 end
95 96 return true
96 97 end
97 98
98 99 def each_line
99 100 prev_line_left, prev_line_right = nil, nil
100 101 each do |line|
101 102 spacing = prev_line_left && prev_line_right && (line.nb_line_left != prev_line_left+1) && (line.nb_line_right != prev_line_right+1)
102 103 yield spacing, line
103 104 prev_line_left = line.nb_line_left.to_i if line.nb_line_left.to_i > 0
104 105 prev_line_right = line.nb_line_right.to_i if line.nb_line_right.to_i > 0
105 106 end
106 107 end
107 108
108 109 def inspect
109 110 puts '### DIFF TABLE ###'
110 111 puts "file : #{file_name}"
111 112 self.each do |d|
112 113 d.inspect
113 114 end
114 115 end
115 116
116 117 private
117 118
118 119 def file_name=(arg)
119 case @style
120 when "Git"
120 both_git_diff = false
121 if file_name.nil?
122 @git_diff = true if arg =~ %r{^(a/|/dev/null)}
123 else
124 both_git_diff = (@git_diff && arg =~ %r{^(b/|/dev/null)})
125 end
126 if both_git_diff
121 127 if file_name && arg == "/dev/null"
122 128 # keep the original file name
129 @file_name = file_name.sub(%r{^a/}, '')
123 130 else
124 # remove leading a/ b/
125 @file_name = arg.sub(%r{^(a|b)/}, '')
131 # remove leading b/
132 @file_name = arg.sub(%r{^b/}, '')
126 133 end
127 when "Subversion"
134 elsif @style == "Subversion"
128 135 # removing trailing "(revision nn)"
129 136 @file_name = arg.sub(%r{\t+\(.*\)$}, '')
130 137 else
131 138 @file_name = arg
132 139 end
133 140 end
134 141
135 142 def diff_for_added_line
136 143 if @type == 'sbs' && @removed > 0 && @added < @removed
137 144 self[-(@removed - @added)]
138 145 else
139 146 diff = Diff.new
140 147 self << diff
141 148 diff
142 149 end
143 150 end
144 151
145 152 def parse_line(line, type="inline")
146 153 if line[0, 1] == "+"
147 154 diff = diff_for_added_line
148 155 diff.line_right = line[1..-1]
149 156 diff.nb_line_right = @line_num_r
150 157 diff.type_diff_right = 'diff_in'
151 158 @line_num_r += 1
152 159 @added += 1
153 160 true
154 161 elsif line[0, 1] == "-"
155 162 diff = Diff.new
156 163 diff.line_left = line[1..-1]
157 164 diff.nb_line_left = @line_num_l
158 165 diff.type_diff_left = 'diff_out'
159 166 self << diff
160 167 @line_num_l += 1
161 168 @removed += 1
162 169 true
163 170 else
164 171 write_offsets
165 172 if line[0, 1] =~ /\s/
166 173 diff = Diff.new
167 174 diff.line_right = line[1..-1]
168 175 diff.nb_line_right = @line_num_r
169 176 diff.line_left = line[1..-1]
170 177 diff.nb_line_left = @line_num_l
171 178 self << diff
172 179 @line_num_l += 1
173 180 @line_num_r += 1
174 181 true
175 182 elsif line[0, 1] = "\\"
176 183 true
177 184 else
178 185 false
179 186 end
180 187 end
181 188 end
182 189
183 190 def write_offsets
184 191 if @added > 0 && @added == @removed
185 192 @added.times do |i|
186 193 line = self[-(1 + i)]
187 194 removed = (@type == 'sbs') ? line : self[-(1 + @added + i)]
188 195 offsets = offsets(removed.line_left, line.line_right)
189 196 removed.offsets = line.offsets = offsets
190 197 end
191 198 end
192 199 @added = 0
193 200 @removed = 0
194 201 end
195 202
196 203 def offsets(line_left, line_right)
197 204 if line_left.present? && line_right.present? && line_left != line_right
198 205 max = [line_left.size, line_right.size].min
199 206 starting = 0
200 207 while starting < max && line_left[starting] == line_right[starting]
201 208 starting += 1
202 209 end
203 210 ending = -1
204 211 while ending >= -(max - starting) && line_left[ending] == line_right[ending]
205 212 ending -= 1
206 213 end
207 214 unless starting == 0 && ending == -1
208 215 [starting, ending]
209 216 end
210 217 end
211 218 end
212 219 end
213 220
214 221 # A line of diff
215 222 class Diff
216 223 attr_accessor :nb_line_left
217 224 attr_accessor :line_left
218 225 attr_accessor :nb_line_right
219 226 attr_accessor :line_right
220 227 attr_accessor :type_diff_right
221 228 attr_accessor :type_diff_left
222 229 attr_accessor :offsets
223 230
224 231 def initialize()
225 232 self.nb_line_left = ''
226 233 self.nb_line_right = ''
227 234 self.line_left = ''
228 235 self.line_right = ''
229 236 self.type_diff_right = ''
230 237 self.type_diff_left = ''
231 238 end
232 239
233 240 def type_diff
234 241 type_diff_right == 'diff_in' ? type_diff_right : type_diff_left
235 242 end
236 243
237 244 def line
238 245 type_diff_right == 'diff_in' ? line_right : line_left
239 246 end
240 247
241 248 def html_line_left
242 249 line_to_html(line_left, offsets)
243 250 end
244 251
245 252 def html_line_right
246 253 line_to_html(line_right, offsets)
247 254 end
248 255
249 256 def html_line
250 257 line_to_html(line, offsets)
251 258 end
252 259
253 260 def inspect
254 261 puts '### Start Line Diff ###'
255 262 puts self.nb_line_left
256 263 puts self.line_left
257 264 puts self.nb_line_right
258 265 puts self.line_right
259 266 end
260 267
261 268 private
262 269
263 270 def line_to_html(line, offsets)
264 271 if offsets
265 272 s = ''
266 273 unless offsets.first == 0
267 274 s << CGI.escapeHTML(line[0..offsets.first-1])
268 275 end
269 276 s << '<span>' + CGI.escapeHTML(line[offsets.first..offsets.last]) + '</span>'
270 277 unless offsets.last == -1
271 278 s << CGI.escapeHTML(line[offsets.last+1..-1])
272 279 end
273 280 s
274 281 else
275 282 CGI.escapeHTML(line)
276 283 end
277 284 end
278 285 end
279 286 end
Show file before | Show file after | Hide comments
@@ -1,511 +1,525
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../test_helper', __FILE__)
19 19
20 20 class RepositoriesMercurialControllerTest < ActionController::TestCase
21 21 tests RepositoriesController
22 22
23 23 fixtures :projects, :users, :roles, :members, :member_roles,
24 24 :repositories, :enabled_modules
25 25
26 26 REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
27 27 CHAR_1_HEX = "\xc3\x9c"
28 28 PRJ_ID = 3
29 29 NUM_REV = 32
30 30
31 31 ruby19_non_utf8_pass =
32 32 (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
33 33
34 34 def setup
35 35 User.current = nil
36 36 @project = Project.find(PRJ_ID)
37 37 @repository = Repository::Mercurial.create(
38 38 :project => @project,
39 39 :url => REPOSITORY_PATH,
40 40 :path_encoding => 'ISO-8859-1'
41 41 )
42 42 assert @repository
43 43 @diff_c_support = true
44 44 @char_1 = CHAR_1_HEX.dup
45 45 @tag_char_1 = "tag-#{CHAR_1_HEX}-00"
46 46 @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
47 47 @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
48 48 if @char_1.respond_to?(:force_encoding)
49 49 @char_1.force_encoding('UTF-8')
50 50 @tag_char_1.force_encoding('UTF-8')
51 51 @branch_char_0.force_encoding('UTF-8')
52 52 @branch_char_1.force_encoding('UTF-8')
53 53 end
54 54 end
55 55
56 56 if ruby19_non_utf8_pass
57 57 puts "TODO: Mercurial functional test fails in Ruby 1.9 " +
58 58 "and Encoding.default_external is not UTF-8. " +
59 59 "Current value is '#{Encoding.default_external.to_s}'"
60 60 def test_fake; assert true end
61 61 elsif File.directory?(REPOSITORY_PATH)
62 62
63 63 def test_get_new
64 64 @request.session[:user_id] = 1
65 65 @project.repository.destroy
66 66 get :new, :project_id => 'subproject1', :repository_scm => 'Mercurial'
67 67 assert_response :success
68 68 assert_template 'new'
69 69 assert_kind_of Repository::Mercurial, assigns(:repository)
70 70 assert assigns(:repository).new_record?
71 71 end
72 72
73 73 def test_show_root
74 74 assert_equal 0, @repository.changesets.count
75 75 @repository.fetch_changesets
76 76 @project.reload
77 77 assert_equal NUM_REV, @repository.changesets.count
78 78 get :show, :id => PRJ_ID
79 79 assert_response :success
80 80 assert_template 'show'
81 81 assert_not_nil assigns(:entries)
82 82 assert_equal 4, assigns(:entries).size
83 83 assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
84 84 assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
85 85 assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
86 86 assert_not_nil assigns(:changesets)
87 87 assert assigns(:changesets).size > 0
88 88 end
89 89
90 90 def test_show_directory
91 91 assert_equal 0, @repository.changesets.count
92 92 @repository.fetch_changesets
93 93 @project.reload
94 94 assert_equal NUM_REV, @repository.changesets.count
95 95 get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param]
96 96 assert_response :success
97 97 assert_template 'show'
98 98 assert_not_nil assigns(:entries)
99 99 assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
100 100 entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
101 101 assert_not_nil entry
102 102 assert_equal 'file', entry.kind
103 103 assert_equal 'images/edit.png', entry.path
104 104 assert_not_nil assigns(:changesets)
105 105 assert assigns(:changesets).size > 0
106 106 end
107 107
108 108 def test_show_at_given_revision
109 109 assert_equal 0, @repository.changesets.count
110 110 @repository.fetch_changesets
111 111 @project.reload
112 112 assert_equal NUM_REV, @repository.changesets.count
113 113 [0, '0', '0885933ad4f6'].each do |r1|
114 114 get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
115 115 :rev => r1
116 116 assert_response :success
117 117 assert_template 'show'
118 118 assert_not_nil assigns(:entries)
119 119 assert_equal ['delete.png'], assigns(:entries).collect(&:name)
120 120 assert_not_nil assigns(:changesets)
121 121 assert assigns(:changesets).size > 0
122 122 end
123 123 end
124 124
125 125 def test_show_directory_sql_escape_percent
126 126 assert_equal 0, @repository.changesets.count
127 127 @repository.fetch_changesets
128 128 @project.reload
129 129 assert_equal NUM_REV, @repository.changesets.count
130 130 [13, '13', '3a330eb32958'].each do |r1|
131 131 get :show, :id => PRJ_ID,
132 132 :path => repository_path_hash(['sql_escape', 'percent%dir'])[:param],
133 133 :rev => r1
134 134 assert_response :success
135 135 assert_template 'show'
136 136
137 137 assert_not_nil assigns(:entries)
138 138 assert_equal ['percent%file1.txt', 'percentfile1.txt'],
139 139 assigns(:entries).collect(&:name)
140 140 changesets = assigns(:changesets)
141 141 assert_not_nil changesets
142 142 assert assigns(:changesets).size > 0
143 143 assert_equal %w(13 11 10 9), changesets.collect(&:revision)
144 144 end
145 145 end
146 146
147 147 def test_show_directory_latin_1_path
148 148 assert_equal 0, @repository.changesets.count
149 149 @repository.fetch_changesets
150 150 @project.reload
151 151 assert_equal NUM_REV, @repository.changesets.count
152 152 [21, '21', 'adf805632193'].each do |r1|
153 153 get :show, :id => PRJ_ID,
154 154 :path => repository_path_hash(['latin-1-dir'])[:param],
155 155 :rev => r1
156 156 assert_response :success
157 157 assert_template 'show'
158 158
159 159 assert_not_nil assigns(:entries)
160 160 assert_equal ["make-latin-1-file.rb",
161 161 "test-#{@char_1}-1.txt",
162 162 "test-#{@char_1}-2.txt",
163 163 "test-#{@char_1}.txt"], assigns(:entries).collect(&:name)
164 164 changesets = assigns(:changesets)
165 165 assert_not_nil changesets
166 166 assert_equal %w(21 20 19 18 17), changesets.collect(&:revision)
167 167 end
168 168 end
169 169
170 170 def show_should_show_branch_selection_form
171 171 @repository.fetch_changesets
172 172 @project.reload
173 173 get :show, :id => PRJ_ID
174 174 assert_tag 'form', :attributes => {:id => 'revision_selector', :action => '/projects/subproject1/repository/show'}
175 175 assert_tag 'select', :attributes => {:name => 'branch'},
176 176 :child => {:tag => 'option', :attributes => {:value => 'test-branch-01'}},
177 177 :parent => {:tag => 'form', :attributes => {:id => 'revision_selector'}}
178 178 end
179 179
180 180 def test_show_branch
181 181 assert_equal 0, @repository.changesets.count
182 182 @repository.fetch_changesets
183 183 @project.reload
184 184 assert_equal NUM_REV, @repository.changesets.count
185 185 [
186 186 'default',
187 187 @branch_char_1,
188 188 'branch (1)[2]&,%.-3_4',
189 189 @branch_char_0,
190 190 'test_branch.latin-1',
191 191 'test-branch-00',
192 192 ].each do |bra|
193 193 get :show, :id => PRJ_ID, :rev => bra
194 194 assert_response :success
195 195 assert_template 'show'
196 196 assert_not_nil assigns(:entries)
197 197 assert assigns(:entries).size > 0
198 198 assert_not_nil assigns(:changesets)
199 199 assert assigns(:changesets).size > 0
200 200 end
201 201 end
202 202
203 203 def test_show_tag
204 204 assert_equal 0, @repository.changesets.count
205 205 @repository.fetch_changesets
206 206 @project.reload
207 207 assert_equal NUM_REV, @repository.changesets.count
208 208 [
209 209 @tag_char_1,
210 210 'tag_test.00',
211 211 'tag-init-revision'
212 212 ].each do |tag|
213 213 get :show, :id => PRJ_ID, :rev => tag
214 214 assert_response :success
215 215 assert_template 'show'
216 216 assert_not_nil assigns(:entries)
217 217 assert assigns(:entries).size > 0
218 218 assert_not_nil assigns(:changesets)
219 219 assert assigns(:changesets).size > 0
220 220 end
221 221 end
222 222
223 223 def test_changes
224 224 get :changes, :id => PRJ_ID,
225 225 :path => repository_path_hash(['images', 'edit.png'])[:param]
226 226 assert_response :success
227 227 assert_template 'changes'
228 228 assert_tag :tag => 'h2', :content => 'edit.png'
229 229 end
230 230
231 231 def test_entry_show
232 232 get :entry, :id => PRJ_ID,
233 233 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
234 234 assert_response :success
235 235 assert_template 'entry'
236 236 # Line 10
237 237 assert_tag :tag => 'th',
238 238 :content => '10',
239 239 :attributes => { :class => 'line-num' },
240 240 :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
241 241 end
242 242
243 243 def test_entry_show_latin_1_path
244 244 [21, '21', 'adf805632193'].each do |r1|
245 245 get :entry, :id => PRJ_ID,
246 246 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}-2.txt"])[:param],
247 247 :rev => r1
248 248 assert_response :success
249 249 assert_template 'entry'
250 250 assert_tag :tag => 'th',
251 251 :content => '1',
252 252 :attributes => { :class => 'line-num' },
253 253 :sibling => { :tag => 'td',
254 254 :content => /Mercurial is a distributed version control system/ }
255 255 end
256 256 end
257 257
258 258 def test_entry_show_latin_1_contents
259 259 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
260 260 [27, '27', '7bbf4c738e71'].each do |r1|
261 261 get :entry, :id => PRJ_ID,
262 262 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
263 263 :rev => r1
264 264 assert_response :success
265 265 assert_template 'entry'
266 266 assert_tag :tag => 'th',
267 267 :content => '1',
268 268 :attributes => { :class => 'line-num' },
269 269 :sibling => { :tag => 'td',
270 270 :content => /test-#{@char_1}.txt/ }
271 271 end
272 272 end
273 273 end
274 274
275 275 def test_entry_download
276 276 get :entry, :id => PRJ_ID,
277 277 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
278 278 :format => 'raw'
279 279 assert_response :success
280 280 # File content
281 281 assert @response.body.include?('WITHOUT ANY WARRANTY')
282 282 end
283 283
284 284 def test_entry_binary_force_download
285 285 get :entry, :id => PRJ_ID, :rev => 1,
286 286 :path => repository_path_hash(['images', 'edit.png'])[:param]
287 287 assert_response :success
288 288 assert_equal 'image/png', @response.content_type
289 289 end
290 290
291 291 def test_directory_entry
292 292 get :entry, :id => PRJ_ID,
293 293 :path => repository_path_hash(['sources'])[:param]
294 294 assert_response :success
295 295 assert_template 'show'
296 296 assert_not_nil assigns(:entry)
297 297 assert_equal 'sources', assigns(:entry).name
298 298 end
299 299
300 300 def test_diff
301 301 assert_equal 0, @repository.changesets.count
302 302 @repository.fetch_changesets
303 303 @project.reload
304 304 assert_equal NUM_REV, @repository.changesets.count
305 305 [4, '4', 'def6d2f1254a'].each do |r1|
306 306 # Full diff of changeset 4
307 307 ['inline', 'sbs'].each do |dt|
308 308 get :diff, :id => PRJ_ID, :rev => r1, :type => dt
309 309 assert_response :success
310 310 assert_template 'diff'
311 311 if @diff_c_support
312 312 # Line 22 removed
313 313 assert_tag :tag => 'th',
314 314 :content => '22',
315 315 :sibling => { :tag => 'td',
316 316 :attributes => { :class => /diff_out/ },
317 317 :content => /def remove/ }
318 318 assert_tag :tag => 'h2', :content => /4:def6d2f1254a/
319 319 end
320 320 end
321 321 end
322 322 end
323 323
324 324 def test_diff_two_revs
325 325 assert_equal 0, @repository.changesets.count
326 326 @repository.fetch_changesets
327 327 @project.reload
328 328 assert_equal NUM_REV, @repository.changesets.count
329 329 [2, '400bb8672109', '400', 400].each do |r1|
330 330 [4, 'def6d2f1254a'].each do |r2|
331 331 ['inline', 'sbs'].each do |dt|
332 332 get :diff,
333 333 :id => PRJ_ID,
334 334 :rev => r1,
335 335 :rev_to => r2,
336 336 :type => dt
337 337 assert_response :success
338 338 assert_template 'diff'
339 339 diff = assigns(:diff)
340 340 assert_not_nil diff
341 341 assert_tag :tag => 'h2',
342 342 :content => /4:def6d2f1254a 2:400bb8672109/
343 343 end
344 344 end
345 345 end
346 346 end
347 347
348 348 def test_diff_latin_1_path
349 349 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
350 350 [21, 'adf805632193'].each do |r1|
351 351 ['inline', 'sbs'].each do |dt|
352 352 get :diff, :id => PRJ_ID, :rev => r1, :type => dt
353 353 assert_response :success
354 354 assert_template 'diff'
355 355 assert_tag :tag => 'thead',
356 356 :descendant => {
357 357 :tag => 'th',
358 358 :attributes => { :class => 'filename' } ,
359 359 :content => /latin-1-dir\/test-#{@char_1}-2.txt/ ,
360 360 },
361 361 :sibling => {
362 362 :tag => 'tbody',
363 363 :descendant => {
364 364 :tag => 'td',
365 365 :attributes => { :class => /diff_in/ },
366 366 :content => /It is written in Python/
367 367 }
368 368 }
369 369 end
370 370 end
371 371 end
372 372 end
373 373
374 def test_diff_should_show_modified_filenames
375 get :diff, :id => PRJ_ID, :rev => '400bb8672109', :type => 'inline'
376 assert_response :success
377 assert_template 'diff'
378 assert_select 'th.filename', :text => 'sources/watchers_controller.rb'
379 end
380
381 def test_diff_should_show_deleted_filenames
382 get :diff, :id => PRJ_ID, :rev => 'b3a615152df8', :type => 'inline'
383 assert_response :success
384 assert_template 'diff'
385 assert_select 'th.filename', :text => 'sources/welcome_controller.rb'
386 end
387
374 388 def test_annotate
375 389 get :annotate, :id => PRJ_ID,
376 390 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
377 391 assert_response :success
378 392 assert_template 'annotate'
379 393
380 394 # Line 22, revision 4:def6d2f1254a
381 395 assert_select 'tr' do
382 396 assert_select 'th.line-num', :text => '22'
383 397 assert_select 'td.revision', :text => '4:def6d2f1254a'
384 398 assert_select 'td.author', :text => 'jsmith'
385 399 assert_select 'td', :text => /remove_watcher/
386 400 end
387 401 end
388 402
389 403 def test_annotate_not_in_tip
390 404 assert_equal 0, @repository.changesets.count
391 405 @repository.fetch_changesets
392 406 @project.reload
393 407 assert_equal NUM_REV, @repository.changesets.count
394 408 get :annotate, :id => PRJ_ID,
395 409 :path => repository_path_hash(['sources', 'welcome_controller.rb'])[:param]
396 410 assert_response 404
397 411 assert_error_tag :content => /was not found/
398 412 end
399 413
400 414 def test_annotate_at_given_revision
401 415 assert_equal 0, @repository.changesets.count
402 416 @repository.fetch_changesets
403 417 @project.reload
404 418 assert_equal NUM_REV, @repository.changesets.count
405 419 [2, '400bb8672109', '400', 400].each do |r1|
406 420 get :annotate, :id => PRJ_ID, :rev => r1,
407 421 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
408 422 assert_response :success
409 423 assert_template 'annotate'
410 424 assert_tag :tag => 'h2', :content => /@ 2:400bb8672109/
411 425 end
412 426 end
413 427
414 428 def test_annotate_latin_1_path
415 429 [21, '21', 'adf805632193'].each do |r1|
416 430 get :annotate, :id => PRJ_ID,
417 431 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}-2.txt"])[:param],
418 432 :rev => r1
419 433 assert_response :success
420 434 assert_template 'annotate'
421 435 assert_tag :tag => 'th',
422 436 :content => '1',
423 437 :attributes => { :class => 'line-num' },
424 438 :sibling =>
425 439 {
426 440 :tag => 'td',
427 441 :attributes => { :class => 'revision' },
428 442 :child => { :tag => 'a', :content => '20:709858aafd1b' }
429 443 }
430 444 assert_tag :tag => 'th',
431 445 :content => '1',
432 446 :attributes => { :class => 'line-num' },
433 447 :sibling =>
434 448 {
435 449 :tag => 'td' ,
436 450 :content => 'jsmith' ,
437 451 :attributes => { :class => 'author' },
438 452 }
439 453 assert_tag :tag => 'th',
440 454 :content => '1',
441 455 :attributes => { :class => 'line-num' },
442 456 :sibling => { :tag => 'td',
443 457 :content => /Mercurial is a distributed version control system/ }
444 458
445 459 end
446 460 end
447 461
448 462 def test_annotate_latin_1_contents
449 463 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
450 464 [27, '7bbf4c738e71'].each do |r1|
451 465 get :annotate, :id => PRJ_ID,
452 466 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
453 467 :rev => r1
454 468 assert_tag :tag => 'th',
455 469 :content => '1',
456 470 :attributes => { :class => 'line-num' },
457 471 :sibling => { :tag => 'td',
458 472 :content => /test-#{@char_1}.txt/ }
459 473 end
460 474 end
461 475 end
462 476
463 477 def test_empty_revision
464 478 assert_equal 0, @repository.changesets.count
465 479 @repository.fetch_changesets
466 480 @project.reload
467 481 assert_equal NUM_REV, @repository.changesets.count
468 482 ['', ' ', nil].each do |r|
469 483 get :revision, :id => PRJ_ID, :rev => r
470 484 assert_response 404
471 485 assert_error_tag :content => /was not found/
472 486 end
473 487 end
474 488
475 489 def test_destroy_valid_repository
476 490 @request.session[:user_id] = 1 # admin
477 491 assert_equal 0, @repository.changesets.count
478 492 @repository.fetch_changesets
479 493 assert_equal NUM_REV, @repository.changesets.count
480 494
481 495 assert_difference 'Repository.count', -1 do
482 496 delete :destroy, :id => @repository.id
483 497 end
484 498 assert_response 302
485 499 @project.reload
486 500 assert_nil @project.repository
487 501 end
488 502
489 503 def test_destroy_invalid_repository
490 504 @request.session[:user_id] = 1 # admin
491 505 @project.repository.destroy
492 506 @repository = Repository::Mercurial.create!(
493 507 :project => Project.find(PRJ_ID),
494 508 :url => "/invalid",
495 509 :path_encoding => 'ISO-8859-1'
496 510 )
497 511 @repository.fetch_changesets
498 512 assert_equal 0, @repository.changesets.count
499 513
500 514 assert_difference 'Repository.count', -1 do
501 515 delete :destroy, :id => @repository.id
502 516 end
503 517 assert_response 302
504 518 @project.reload
505 519 assert_nil @project.repository
506 520 end
507 521 else
508 522 puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
509 523 def test_fake; assert true end
510 524 end
511 525 end
Show file before | Show file after | Hide comments
@@ -1,179 +1,233
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../../../test_helper', __FILE__)
19 19
20 20 class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
21 21
22 22 def setup
23 23 end
24 24
25 25 def test_subversion_diff
26 26 diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'))
27 27 # number of files
28 28 assert_equal 4, diff.size
29 29 assert diff.detect {|file| file.file_name =~ %r{^config/settings.yml}}
30 30 end
31 31
32 32 def test_truncate_diff
33 33 diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'), :max_lines => 20)
34 34 assert_equal 2, diff.size
35 35 end
36 36
37 37 def test_inline_partials
38 38 diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'))
39 39 assert_equal 1, diff.size
40 40 diff = diff.first
41 41 assert_equal 43, diff.size
42 42
43 43 assert_equal [51, -1], diff[0].offsets
44 44 assert_equal [51, -1], diff[1].offsets
45 45 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line
46 46 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[1].html_line
47 47
48 48 assert_nil diff[2].offsets
49 49 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[2].html_line
50 50
51 51 assert_equal [0, -14], diff[3].offsets
52 52 assert_equal [0, -14], diff[4].offsets
53 53 assert_equal '<span>Ut sed</span> auctor justo', diff[3].html_line
54 54 assert_equal '<span>xxx</span> auctor justo', diff[4].html_line
55 55
56 56 assert_equal [13, -19], diff[6].offsets
57 57 assert_equal [13, -19], diff[7].offsets
58 58
59 59 assert_equal [24, -8], diff[9].offsets
60 60 assert_equal [24, -8], diff[10].offsets
61 61
62 62 assert_equal [37, -1], diff[12].offsets
63 63 assert_equal [37, -1], diff[13].offsets
64 64
65 65 assert_equal [0, -38], diff[15].offsets
66 66 assert_equal [0, -38], diff[16].offsets
67 67 end
68 68
69 69 def test_side_by_side_partials
70 70 diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'), :type => 'sbs')
71 71 assert_equal 1, diff.size
72 72 diff = diff.first
73 73 assert_equal 32, diff.size
74 74
75 75 assert_equal [51, -1], diff[0].offsets
76 76 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line_left
77 77 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[0].html_line_right
78 78
79 79 assert_nil diff[1].offsets
80 80 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_left
81 81 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_right
82 82
83 83 assert_equal [0, -14], diff[2].offsets
84 84 assert_equal '<span>Ut sed</span> auctor justo', diff[2].html_line_left
85 85 assert_equal '<span>xxx</span> auctor justo', diff[2].html_line_right
86 86
87 87 assert_equal [13, -19], diff[4].offsets
88 88 assert_equal [24, -8], diff[6].offsets
89 89 assert_equal [37, -1], diff[8].offsets
90 90 assert_equal [0, -38], diff[10].offsets
91 91
92 92 end
93 93
94 94 def test_partials_with_html_entities
95 95 raw = <<-DIFF
96 96 --- test.orig.txt Wed Feb 15 16:10:39 2012
97 97 +++ test.new.txt Wed Feb 15 16:11:25 2012
98 98 @@ -1,5 +1,5 @@
99 99 Semicolons were mysteriously appearing in code diffs in the repository
100 100
101 101 -void DoSomething(std::auto_ptr<MyClass> myObj)
102 102 +void DoSomething(const MyClass& myObj)
103 103
104 104 DIFF
105 105
106 106 diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
107 107 assert_equal 1, diff.size
108 108 assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line_left
109 109 assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[2].html_line_right
110 110
111 111 diff = Redmine::UnifiedDiff.new(raw, :type => 'inline')
112 112 assert_equal 1, diff.size
113 113 assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line
114 114 assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[3].html_line
115 115 end
116 116
117 117 def test_line_starting_with_dashes
118 118 diff = Redmine::UnifiedDiff.new(<<-DIFF
119 119 --- old.txt Wed Nov 11 14:24:58 2009
120 120 +++ new.txt Wed Nov 11 14:25:02 2009
121 121 @@ -1,8 +1,4 @@
122 122 -Lines that starts with dashes:
123 123 -
124 124 -------------------------
125 125 --- file.c
126 126 -------------------------
127 127 +A line that starts with dashes:
128 128
129 129 and removed.
130 130
131 131 @@ -23,4 +19,4 @@
132 132
133 133
134 134
135 135 -Another chunk of change
136 136 +Another chunk of changes
137 137
138 138 DIFF
139 139 )
140 140 assert_equal 1, diff.size
141 141 end
142 142
143 143 def test_one_line_new_files
144 144 diff = Redmine::UnifiedDiff.new(<<-DIFF
145 145 diff -r 000000000000 -r ea98b14f75f0 README1
146 146 --- /dev/null
147 147 +++ b/README1
148 148 @@ -0,0 +1,1 @@
149 149 +test1
150 150 diff -r 000000000000 -r ea98b14f75f0 README2
151 151 --- /dev/null
152 152 +++ b/README2
153 153 @@ -0,0 +1,1 @@
154 154 +test2
155 155 diff -r 000000000000 -r ea98b14f75f0 README3
156 156 --- /dev/null
157 157 +++ b/README3
158 158 @@ -0,0 +1,3 @@
159 159 +test4
160 160 +test5
161 161 +test6
162 162 diff -r 000000000000 -r ea98b14f75f0 README4
163 163 --- /dev/null
164 164 +++ b/README4
165 165 @@ -0,0 +1,3 @@
166 166 +test4
167 167 +test5
168 168 +test6
169 169 DIFF
170 170 )
171 171 assert_equal 4, diff.size
172 assert_equal "README1", diff[0].file_name
173 end
174
175 def test_both_git_diff
176 diff = Redmine::UnifiedDiff.new(<<-DIFF
177 # HG changeset patch
178 # User test
179 # Date 1348014182 -32400
180 # Node ID d1c871b8ef113df7f1c56d41e6e3bfbaff976e1f
181 # Parent 180b6605936cdc7909c5f08b59746ec1a7c99b3e
182 modify test1.txt
183
184 diff -r 180b6605936c -r d1c871b8ef11 test1.txt
185 --- a/test1.txt
186 +++ b/test1.txt
187 @@ -1,1 +1,1 @@
188 -test1
189 +modify test1
190 DIFF
191 )
192 assert_equal 1, diff.size
193 assert_equal "test1.txt", diff[0].file_name
194 end
195
196 def test_include_a_b_slash
197 diff = Redmine::UnifiedDiff.new(<<-DIFF
198 --- test1.txt
199 +++ b/test02.txt
200 @@ -1 +0,0 @@
201 -modify test1
202 DIFF
203 )
204 assert_equal 1, diff.size
205 assert_equal "b/test02.txt", diff[0].file_name
206
207 diff = Redmine::UnifiedDiff.new(<<-DIFF
208 --- a/test1.txt
209 +++ a/test02.txt
210 @@ -1 +0,0 @@
211 -modify test1
212 DIFF
213 )
214 assert_equal 1, diff.size
215 assert_equal "a/test02.txt", diff[0].file_name
216
217 diff = Redmine::UnifiedDiff.new(<<-DIFF
218 --- a/test1.txt
219 +++ test02.txt
220 @@ -1 +0,0 @@
221 -modify test1
222 DIFF
223 )
224 assert_equal 1, diff.size
225 assert_equal "test02.txt", diff[0].file_name
172 226 end
173 227
174 228 private
175 229
176 230 def read_diff_fixture(filename)
177 231 File.new(File.join(File.dirname(__FILE__), '/../../../fixtures/diffs', filename)).read
178 232 end
179 233 end
General Comments 0
You need to be logged in to leave comments. Login now