##// END OF EJS Templates
Merged r10498 from trunk...
Toshi MARUYAMA -
r10291:59d4d210a76b
parent child
Show More
@@ -1,575 +1,575
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 require File.expand_path('../../test_helper', __FILE__)
18 require File.expand_path('../../test_helper', __FILE__)
19
19
20 class RepositoriesGitControllerTest < ActionController::TestCase
20 class RepositoriesGitControllerTest < ActionController::TestCase
21 tests RepositoriesController
21 tests RepositoriesController
22
22
23 fixtures :projects, :users, :roles, :members, :member_roles,
23 fixtures :projects, :users, :roles, :members, :member_roles,
24 :repositories, :enabled_modules
24 :repositories, :enabled_modules
25
25
26 REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
26 REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
27 REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
27 REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
28 PRJ_ID = 3
28 PRJ_ID = 3
29 CHAR_1_HEX = "\xc3\x9c"
29 CHAR_1_HEX = "\xc3\x9c"
30 NUM_REV = 28
30 NUM_REV = 28
31
31
32 ## Git, Mercurial and CVS path encodings are binary.
32 ## Git, Mercurial and CVS path encodings are binary.
33 ## Subversion supports URL encoding for path.
33 ## Subversion supports URL encoding for path.
34 ## Redmine Mercurial adapter and extension use URL encoding.
34 ## Redmine Mercurial adapter and extension use URL encoding.
35 ## Git accepts only binary path in command line parameter.
35 ## Git accepts only binary path in command line parameter.
36 ## So, there is no way to use binary command line parameter in JRuby.
36 ## So, there is no way to use binary command line parameter in JRuby.
37 JRUBY_SKIP = (RUBY_PLATFORM == 'java')
37 JRUBY_SKIP = (RUBY_PLATFORM == 'java')
38 JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
38 JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
39
39
40 def setup
40 def setup
41 @ruby19_non_utf8_pass =
41 @ruby19_non_utf8_pass =
42 (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
42 (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
43
43
44 User.current = nil
44 User.current = nil
45 @project = Project.find(PRJ_ID)
45 @project = Project.find(PRJ_ID)
46 @repository = Repository::Git.create(
46 @repository = Repository::Git.create(
47 :project => @project,
47 :project => @project,
48 :url => REPOSITORY_PATH,
48 :url => REPOSITORY_PATH,
49 :path_encoding => 'ISO-8859-1'
49 :path_encoding => 'ISO-8859-1'
50 )
50 )
51 assert @repository
51 assert @repository
52 @char_1 = CHAR_1_HEX.dup
52 @char_1 = CHAR_1_HEX.dup
53 if @char_1.respond_to?(:force_encoding)
53 if @char_1.respond_to?(:force_encoding)
54 @char_1.force_encoding('UTF-8')
54 @char_1.force_encoding('UTF-8')
55 end
55 end
56
57 Setting.default_language = 'en'
58 end
56 end
59
57
60 def test_create_and_update
58 def test_create_and_update
61 @request.session[:user_id] = 1
59 @request.session[:user_id] = 1
62 assert_difference 'Repository.count' do
60 assert_difference 'Repository.count' do
63 post :create, :project_id => 'subproject1',
61 post :create, :project_id => 'subproject1',
64 :repository_scm => 'Git',
62 :repository_scm => 'Git',
65 :repository => {
63 :repository => {
66 :url => '/test',
64 :url => '/test',
67 :is_default => '0',
65 :is_default => '0',
68 :identifier => 'test-create',
66 :identifier => 'test-create',
69 :extra_report_last_commit => '1',
67 :extra_report_last_commit => '1',
70 }
68 }
71 end
69 end
72 assert_response 302
70 assert_response 302
73 repository = Repository.first(:order => 'id DESC')
71 repository = Repository.first(:order => 'id DESC')
74 assert_kind_of Repository::Git, repository
72 assert_kind_of Repository::Git, repository
75 assert_equal '/test', repository.url
73 assert_equal '/test', repository.url
76 assert_equal true, repository.extra_report_last_commit
74 assert_equal true, repository.extra_report_last_commit
77
75
78 put :update, :id => repository.id,
76 put :update, :id => repository.id,
79 :repository => {
77 :repository => {
80 :extra_report_last_commit => '0',
78 :extra_report_last_commit => '0',
81 :identifier => 'test-update',
79 :identifier => 'test-update',
82 }
80 }
83 assert_response 302
81 assert_response 302
84 repo2 = Repository.find(repository.id)
82 repo2 = Repository.find(repository.id)
85 assert_equal 'test-update', repo2.identifier
83 assert_equal 'test-update', repo2.identifier
86 assert_equal false, repo2.extra_report_last_commit
84 assert_equal false, repo2.extra_report_last_commit
87 end
85 end
88
86
89 if File.directory?(REPOSITORY_PATH)
87 if File.directory?(REPOSITORY_PATH)
90 ## Ruby uses ANSI api to fork a process on Windows.
88 ## Ruby uses ANSI api to fork a process on Windows.
91 ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
89 ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
92 ## and these are incompatible with ASCII.
90 ## and these are incompatible with ASCII.
93 ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
91 ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
94 ## http://code.google.com/p/msysgit/issues/detail?id=80
92 ## http://code.google.com/p/msysgit/issues/detail?id=80
95 ## So, Latin-1 path tests fail on Japanese Windows
93 ## So, Latin-1 path tests fail on Japanese Windows
96 WINDOWS_PASS = (Redmine::Platform.mswin? &&
94 WINDOWS_PASS = (Redmine::Platform.mswin? &&
97 Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
95 Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
98 WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
96 WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
99
97
100 def test_get_new
98 def test_get_new
101 @request.session[:user_id] = 1
99 @request.session[:user_id] = 1
102 @project.repository.destroy
100 @project.repository.destroy
103 get :new, :project_id => 'subproject1', :repository_scm => 'Git'
101 get :new, :project_id => 'subproject1', :repository_scm => 'Git'
104 assert_response :success
102 assert_response :success
105 assert_template 'new'
103 assert_template 'new'
106 assert_kind_of Repository::Git, assigns(:repository)
104 assert_kind_of Repository::Git, assigns(:repository)
107 assert assigns(:repository).new_record?
105 assert assigns(:repository).new_record?
108 end
106 end
109
107
110 def test_browse_root
108 def test_browse_root
111 assert_equal 0, @repository.changesets.count
109 assert_equal 0, @repository.changesets.count
112 @repository.fetch_changesets
110 @repository.fetch_changesets
113 @project.reload
111 @project.reload
114 assert_equal NUM_REV, @repository.changesets.count
112 assert_equal NUM_REV, @repository.changesets.count
115
113
116 get :show, :id => PRJ_ID
114 get :show, :id => PRJ_ID
117 assert_response :success
115 assert_response :success
118 assert_template 'show'
116 assert_template 'show'
119 assert_not_nil assigns(:entries)
117 assert_not_nil assigns(:entries)
120 assert_equal 9, assigns(:entries).size
118 assert_equal 9, assigns(:entries).size
121 assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
119 assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
122 assert assigns(:entries).detect {|e| e.name == 'this_is_a_really_long_and_verbose_directory_name' && e.kind == 'dir'}
120 assert assigns(:entries).detect {|e| e.name == 'this_is_a_really_long_and_verbose_directory_name' && e.kind == 'dir'}
123 assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
121 assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
124 assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
122 assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
125 assert assigns(:entries).detect {|e| e.name == 'copied_README' && e.kind == 'file'}
123 assert assigns(:entries).detect {|e| e.name == 'copied_README' && e.kind == 'file'}
126 assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'}
124 assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'}
127 assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'}
125 assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'}
128 assert assigns(:entries).detect {|e| e.name == 'filemane with spaces.txt' && e.kind == 'file'}
126 assert assigns(:entries).detect {|e| e.name == 'filemane with spaces.txt' && e.kind == 'file'}
129 assert assigns(:entries).detect {|e| e.name == ' filename with a leading space.txt ' && e.kind == 'file'}
127 assert assigns(:entries).detect {|e| e.name == ' filename with a leading space.txt ' && e.kind == 'file'}
130 assert_not_nil assigns(:changesets)
128 assert_not_nil assigns(:changesets)
131 assert assigns(:changesets).size > 0
129 assert assigns(:changesets).size > 0
132 end
130 end
133
131
134 def test_browse_branch
132 def test_browse_branch
135 assert_equal 0, @repository.changesets.count
133 assert_equal 0, @repository.changesets.count
136 @repository.fetch_changesets
134 @repository.fetch_changesets
137 @project.reload
135 @project.reload
138 assert_equal NUM_REV, @repository.changesets.count
136 assert_equal NUM_REV, @repository.changesets.count
139 get :show, :id => PRJ_ID, :rev => 'test_branch'
137 get :show, :id => PRJ_ID, :rev => 'test_branch'
140 assert_response :success
138 assert_response :success
141 assert_template 'show'
139 assert_template 'show'
142 assert_not_nil assigns(:entries)
140 assert_not_nil assigns(:entries)
143 assert_equal 4, assigns(:entries).size
141 assert_equal 4, assigns(:entries).size
144 assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
142 assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
145 assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
143 assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
146 assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
144 assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
147 assert assigns(:entries).detect {|e| e.name == 'test.txt' && e.kind == 'file'}
145 assert assigns(:entries).detect {|e| e.name == 'test.txt' && e.kind == 'file'}
148 assert_not_nil assigns(:changesets)
146 assert_not_nil assigns(:changesets)
149 assert assigns(:changesets).size > 0
147 assert assigns(:changesets).size > 0
150 end
148 end
151
149
152 def test_browse_tag
150 def test_browse_tag
153 assert_equal 0, @repository.changesets.count
151 assert_equal 0, @repository.changesets.count
154 @repository.fetch_changesets
152 @repository.fetch_changesets
155 @project.reload
153 @project.reload
156 assert_equal NUM_REV, @repository.changesets.count
154 assert_equal NUM_REV, @repository.changesets.count
157 [
155 [
158 "tag00.lightweight",
156 "tag00.lightweight",
159 "tag01.annotated",
157 "tag01.annotated",
160 ].each do |t1|
158 ].each do |t1|
161 get :show, :id => PRJ_ID, :rev => t1
159 get :show, :id => PRJ_ID, :rev => t1
162 assert_response :success
160 assert_response :success
163 assert_template 'show'
161 assert_template 'show'
164 assert_not_nil assigns(:entries)
162 assert_not_nil assigns(:entries)
165 assert assigns(:entries).size > 0
163 assert assigns(:entries).size > 0
166 assert_not_nil assigns(:changesets)
164 assert_not_nil assigns(:changesets)
167 assert assigns(:changesets).size > 0
165 assert assigns(:changesets).size > 0
168 end
166 end
169 end
167 end
170
168
171 def test_browse_directory
169 def test_browse_directory
172 assert_equal 0, @repository.changesets.count
170 assert_equal 0, @repository.changesets.count
173 @repository.fetch_changesets
171 @repository.fetch_changesets
174 @project.reload
172 @project.reload
175 assert_equal NUM_REV, @repository.changesets.count
173 assert_equal NUM_REV, @repository.changesets.count
176 get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param]
174 get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param]
177 assert_response :success
175 assert_response :success
178 assert_template 'show'
176 assert_template 'show'
179 assert_not_nil assigns(:entries)
177 assert_not_nil assigns(:entries)
180 assert_equal ['edit.png'], assigns(:entries).collect(&:name)
178 assert_equal ['edit.png'], assigns(:entries).collect(&:name)
181 entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
179 entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
182 assert_not_nil entry
180 assert_not_nil entry
183 assert_equal 'file', entry.kind
181 assert_equal 'file', entry.kind
184 assert_equal 'images/edit.png', entry.path
182 assert_equal 'images/edit.png', entry.path
185 assert_not_nil assigns(:changesets)
183 assert_not_nil assigns(:changesets)
186 assert assigns(:changesets).size > 0
184 assert assigns(:changesets).size > 0
187 end
185 end
188
186
189 def test_browse_at_given_revision
187 def test_browse_at_given_revision
190 assert_equal 0, @repository.changesets.count
188 assert_equal 0, @repository.changesets.count
191 @repository.fetch_changesets
189 @repository.fetch_changesets
192 @project.reload
190 @project.reload
193 assert_equal NUM_REV, @repository.changesets.count
191 assert_equal NUM_REV, @repository.changesets.count
194 get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
192 get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
195 :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
193 :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
196 assert_response :success
194 assert_response :success
197 assert_template 'show'
195 assert_template 'show'
198 assert_not_nil assigns(:entries)
196 assert_not_nil assigns(:entries)
199 assert_equal ['delete.png'], assigns(:entries).collect(&:name)
197 assert_equal ['delete.png'], assigns(:entries).collect(&:name)
200 assert_not_nil assigns(:changesets)
198 assert_not_nil assigns(:changesets)
201 assert assigns(:changesets).size > 0
199 assert assigns(:changesets).size > 0
202 end
200 end
203
201
204 def test_changes
202 def test_changes
205 get :changes, :id => PRJ_ID,
203 get :changes, :id => PRJ_ID,
206 :path => repository_path_hash(['images', 'edit.png'])[:param]
204 :path => repository_path_hash(['images', 'edit.png'])[:param]
207 assert_response :success
205 assert_response :success
208 assert_template 'changes'
206 assert_template 'changes'
209 assert_tag :tag => 'h2', :content => 'edit.png'
207 assert_tag :tag => 'h2', :content => 'edit.png'
210 end
208 end
211
209
212 def test_entry_show
210 def test_entry_show
213 get :entry, :id => PRJ_ID,
211 get :entry, :id => PRJ_ID,
214 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
212 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
215 assert_response :success
213 assert_response :success
216 assert_template 'entry'
214 assert_template 'entry'
217 # Line 19
215 # Line 19
218 assert_tag :tag => 'th',
216 assert_tag :tag => 'th',
219 :content => '11',
217 :content => '11',
220 :attributes => { :class => 'line-num' },
218 :attributes => { :class => 'line-num' },
221 :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
219 :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
222 end
220 end
223
221
224 def test_entry_show_latin_1
222 def test_entry_show_latin_1
225 if @ruby19_non_utf8_pass
223 if @ruby19_non_utf8_pass
226 puts_ruby19_non_utf8_pass()
224 puts_ruby19_non_utf8_pass()
227 elsif WINDOWS_PASS
225 elsif WINDOWS_PASS
228 puts WINDOWS_SKIP_STR
226 puts WINDOWS_SKIP_STR
229 elsif JRUBY_SKIP
227 elsif JRUBY_SKIP
230 puts JRUBY_SKIP_STR
228 puts JRUBY_SKIP_STR
231 else
229 else
232 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
230 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
233 ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
231 ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
234 get :entry, :id => PRJ_ID,
232 get :entry, :id => PRJ_ID,
235 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
233 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
236 :rev => r1
234 :rev => r1
237 assert_response :success
235 assert_response :success
238 assert_template 'entry'
236 assert_template 'entry'
239 assert_tag :tag => 'th',
237 assert_tag :tag => 'th',
240 :content => '1',
238 :content => '1',
241 :attributes => { :class => 'line-num' },
239 :attributes => { :class => 'line-num' },
242 :sibling => { :tag => 'td',
240 :sibling => { :tag => 'td',
243 :content => /test-#{@char_1}.txt/ }
241 :content => /test-#{@char_1}.txt/ }
244 end
242 end
245 end
243 end
246 end
244 end
247 end
245 end
248
246
249 def test_entry_download
247 def test_entry_download
250 get :entry, :id => PRJ_ID,
248 get :entry, :id => PRJ_ID,
251 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
249 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
252 :format => 'raw'
250 :format => 'raw'
253 assert_response :success
251 assert_response :success
254 # File content
252 # File content
255 assert @response.body.include?('WITHOUT ANY WARRANTY')
253 assert @response.body.include?('WITHOUT ANY WARRANTY')
256 end
254 end
257
255
258 def test_directory_entry
256 def test_directory_entry
259 get :entry, :id => PRJ_ID,
257 get :entry, :id => PRJ_ID,
260 :path => repository_path_hash(['sources'])[:param]
258 :path => repository_path_hash(['sources'])[:param]
261 assert_response :success
259 assert_response :success
262 assert_template 'show'
260 assert_template 'show'
263 assert_not_nil assigns(:entry)
261 assert_not_nil assigns(:entry)
264 assert_equal 'sources', assigns(:entry).name
262 assert_equal 'sources', assigns(:entry).name
265 end
263 end
266
264
267 def test_diff
265 def test_diff
268 assert_equal 0, @repository.changesets.count
266 assert_equal 0, @repository.changesets.count
269 @repository.fetch_changesets
267 @repository.fetch_changesets
270 @project.reload
268 @project.reload
271 assert_equal NUM_REV, @repository.changesets.count
269 assert_equal NUM_REV, @repository.changesets.count
272 # Full diff of changeset 2f9c0091
270 # Full diff of changeset 2f9c0091
273 ['inline', 'sbs'].each do |dt|
271 ['inline', 'sbs'].each do |dt|
274 get :diff,
272 get :diff,
275 :id => PRJ_ID,
273 :id => PRJ_ID,
276 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
274 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
277 :type => dt
275 :type => dt
278 assert_response :success
276 assert_response :success
279 assert_template 'diff'
277 assert_template 'diff'
280 # Line 22 removed
278 # Line 22 removed
281 assert_tag :tag => 'th',
279 assert_tag :tag => 'th',
282 :content => /22/,
280 :content => /22/,
283 :sibling => { :tag => 'td',
281 :sibling => { :tag => 'td',
284 :attributes => { :class => /diff_out/ },
282 :attributes => { :class => /diff_out/ },
285 :content => /def remove/ }
283 :content => /def remove/ }
286 assert_tag :tag => 'h2', :content => /2f9c0091/
284 assert_tag :tag => 'h2', :content => /2f9c0091/
287 end
285 end
288 end
286 end
289
287
290 def test_diff_with_rev_and_path
288 def test_diff_with_rev_and_path
291 assert_equal 0, @repository.changesets.count
289 assert_equal 0, @repository.changesets.count
292 @repository.fetch_changesets
290 @repository.fetch_changesets
293 @project.reload
291 @project.reload
294 assert_equal NUM_REV, @repository.changesets.count
292 assert_equal NUM_REV, @repository.changesets.count
295 with_settings :diff_max_lines_displayed => 1000 do
293 with_settings :diff_max_lines_displayed => 1000 do
296 # Full diff of changeset 2f9c0091
294 # Full diff of changeset 2f9c0091
297 ['inline', 'sbs'].each do |dt|
295 ['inline', 'sbs'].each do |dt|
298 get :diff,
296 get :diff,
299 :id => PRJ_ID,
297 :id => PRJ_ID,
300 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
298 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
301 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
299 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
302 :type => dt
300 :type => dt
303 assert_response :success
301 assert_response :success
304 assert_template 'diff'
302 assert_template 'diff'
305 # Line 22 removed
303 # Line 22 removed
306 assert_tag :tag => 'th',
304 assert_tag :tag => 'th',
307 :content => '22',
305 :content => '22',
308 :sibling => { :tag => 'td',
306 :sibling => { :tag => 'td',
309 :attributes => { :class => /diff_out/ },
307 :attributes => { :class => /diff_out/ },
310 :content => /def remove/ }
308 :content => /def remove/ }
311 assert_tag :tag => 'h2', :content => /2f9c0091/
309 assert_tag :tag => 'h2', :content => /2f9c0091/
312 end
310 end
313 end
311 end
314 end
312 end
315
313
316 def test_diff_truncated
314 def test_diff_truncated
317 assert_equal 0, @repository.changesets.count
315 assert_equal 0, @repository.changesets.count
318 @repository.fetch_changesets
316 @repository.fetch_changesets
319 @project.reload
317 @project.reload
320 assert_equal NUM_REV, @repository.changesets.count
318 assert_equal NUM_REV, @repository.changesets.count
321
319
322 with_settings :diff_max_lines_displayed => 5 do
320 with_settings :diff_max_lines_displayed => 5 do
323 # Truncated diff of changeset 2f9c0091
321 # Truncated diff of changeset 2f9c0091
324 with_cache do
322 with_cache do
325 get :diff, :id => PRJ_ID, :type => 'inline',
323 with_settings :default_language => 'en' do
326 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
324 get :diff, :id => PRJ_ID, :type => 'inline',
327 assert_response :success
325 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
328 assert @response.body.include?("... This diff was truncated")
326 assert_response :success
327 assert @response.body.include?("... This diff was truncated")
328 end
329 with_settings :default_language => 'fr' do
329 with_settings :default_language => 'fr' do
330 get :diff, :id => PRJ_ID, :type => 'inline',
330 get :diff, :id => PRJ_ID, :type => 'inline',
331 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
331 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
332 assert_response :success
332 assert_response :success
333 assert ! @response.body.include?("... This diff was truncated")
333 assert ! @response.body.include?("... This diff was truncated")
334 assert @response.body.include?("... Ce diff")
334 assert @response.body.include?("... Ce diff")
335 end
335 end
336 end
336 end
337 end
337 end
338 end
338 end
339
339
340 def test_diff_two_revs
340 def test_diff_two_revs
341 assert_equal 0, @repository.changesets.count
341 assert_equal 0, @repository.changesets.count
342 @repository.fetch_changesets
342 @repository.fetch_changesets
343 @project.reload
343 @project.reload
344 assert_equal NUM_REV, @repository.changesets.count
344 assert_equal NUM_REV, @repository.changesets.count
345 ['inline', 'sbs'].each do |dt|
345 ['inline', 'sbs'].each do |dt|
346 get :diff,
346 get :diff,
347 :id => PRJ_ID,
347 :id => PRJ_ID,
348 :rev => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
348 :rev => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
349 :rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
349 :rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
350 :type => dt
350 :type => dt
351 assert_response :success
351 assert_response :success
352 assert_template 'diff'
352 assert_template 'diff'
353 diff = assigns(:diff)
353 diff = assigns(:diff)
354 assert_not_nil diff
354 assert_not_nil diff
355 assert_tag :tag => 'h2', :content => /2f9c0091:61b685fb/
355 assert_tag :tag => 'h2', :content => /2f9c0091:61b685fb/
356 end
356 end
357 end
357 end
358
358
359 def test_diff_latin_1
359 def test_diff_latin_1
360 if @ruby19_non_utf8_pass
360 if @ruby19_non_utf8_pass
361 puts_ruby19_non_utf8_pass()
361 puts_ruby19_non_utf8_pass()
362 else
362 else
363 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
363 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
364 ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
364 ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
365 ['inline', 'sbs'].each do |dt|
365 ['inline', 'sbs'].each do |dt|
366 get :diff, :id => PRJ_ID, :rev => r1, :type => dt
366 get :diff, :id => PRJ_ID, :rev => r1, :type => dt
367 assert_response :success
367 assert_response :success
368 assert_template 'diff'
368 assert_template 'diff'
369 assert_tag :tag => 'thead',
369 assert_tag :tag => 'thead',
370 :descendant => {
370 :descendant => {
371 :tag => 'th',
371 :tag => 'th',
372 :attributes => { :class => 'filename' } ,
372 :attributes => { :class => 'filename' } ,
373 :content => /latin-1-dir\/test-#{@char_1}.txt/ ,
373 :content => /latin-1-dir\/test-#{@char_1}.txt/ ,
374 },
374 },
375 :sibling => {
375 :sibling => {
376 :tag => 'tbody',
376 :tag => 'tbody',
377 :descendant => {
377 :descendant => {
378 :tag => 'td',
378 :tag => 'td',
379 :attributes => { :class => /diff_in/ },
379 :attributes => { :class => /diff_in/ },
380 :content => /test-#{@char_1}.txt/
380 :content => /test-#{@char_1}.txt/
381 }
381 }
382 }
382 }
383 end
383 end
384 end
384 end
385 end
385 end
386 end
386 end
387 end
387 end
388
388
389 def test_save_diff_type
389 def test_save_diff_type
390 @request.session[:user_id] = 1 # admin
390 @request.session[:user_id] = 1 # admin
391 user = User.find(1)
391 user = User.find(1)
392 get :diff,
392 get :diff,
393 :id => PRJ_ID,
393 :id => PRJ_ID,
394 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
394 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
395 assert_response :success
395 assert_response :success
396 assert_template 'diff'
396 assert_template 'diff'
397 user.reload
397 user.reload
398 assert_equal "inline", user.pref[:diff_type]
398 assert_equal "inline", user.pref[:diff_type]
399 get :diff,
399 get :diff,
400 :id => PRJ_ID,
400 :id => PRJ_ID,
401 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
401 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
402 :type => 'sbs'
402 :type => 'sbs'
403 assert_response :success
403 assert_response :success
404 assert_template 'diff'
404 assert_template 'diff'
405 user.reload
405 user.reload
406 assert_equal "sbs", user.pref[:diff_type]
406 assert_equal "sbs", user.pref[:diff_type]
407 end
407 end
408
408
409 def test_annotate
409 def test_annotate
410 get :annotate, :id => PRJ_ID,
410 get :annotate, :id => PRJ_ID,
411 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
411 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
412 assert_response :success
412 assert_response :success
413 assert_template 'annotate'
413 assert_template 'annotate'
414 # Line 24, changeset 2f9c0091
414 # Line 24, changeset 2f9c0091
415 assert_tag :tag => 'th', :content => '24',
415 assert_tag :tag => 'th', :content => '24',
416 :sibling => {
416 :sibling => {
417 :tag => 'td',
417 :tag => 'td',
418 :child => {
418 :child => {
419 :tag => 'a',
419 :tag => 'a',
420 :content => /2f9c0091/
420 :content => /2f9c0091/
421 }
421 }
422 }
422 }
423 assert_tag :tag => 'th', :content => '24',
423 assert_tag :tag => 'th', :content => '24',
424 :sibling => { :tag => 'td', :content => /jsmith/ }
424 :sibling => { :tag => 'td', :content => /jsmith/ }
425 assert_tag :tag => 'th', :content => '24',
425 assert_tag :tag => 'th', :content => '24',
426 :sibling => {
426 :sibling => {
427 :tag => 'td',
427 :tag => 'td',
428 :child => {
428 :child => {
429 :tag => 'a',
429 :tag => 'a',
430 :content => /2f9c0091/
430 :content => /2f9c0091/
431 }
431 }
432 }
432 }
433 assert_tag :tag => 'th', :content => '24',
433 assert_tag :tag => 'th', :content => '24',
434 :sibling => { :tag => 'td', :content => /watcher =/ }
434 :sibling => { :tag => 'td', :content => /watcher =/ }
435 end
435 end
436
436
437 def test_annotate_at_given_revision
437 def test_annotate_at_given_revision
438 assert_equal 0, @repository.changesets.count
438 assert_equal 0, @repository.changesets.count
439 @repository.fetch_changesets
439 @repository.fetch_changesets
440 @project.reload
440 @project.reload
441 assert_equal NUM_REV, @repository.changesets.count
441 assert_equal NUM_REV, @repository.changesets.count
442 get :annotate, :id => PRJ_ID, :rev => 'deff7',
442 get :annotate, :id => PRJ_ID, :rev => 'deff7',
443 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
443 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
444 assert_response :success
444 assert_response :success
445 assert_template 'annotate'
445 assert_template 'annotate'
446 assert_tag :tag => 'h2', :content => /@ deff712f/
446 assert_tag :tag => 'h2', :content => /@ deff712f/
447 end
447 end
448
448
449 def test_annotate_binary_file
449 def test_annotate_binary_file
450 get :annotate, :id => PRJ_ID,
450 get :annotate, :id => PRJ_ID,
451 :path => repository_path_hash(['images', 'edit.png'])[:param]
451 :path => repository_path_hash(['images', 'edit.png'])[:param]
452 assert_response 500
452 assert_response 500
453 assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
453 assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
454 :content => /cannot be annotated/
454 :content => /cannot be annotated/
455 end
455 end
456
456
457 def test_annotate_error_when_too_big
457 def test_annotate_error_when_too_big
458 with_settings :file_max_size_displayed => 1 do
458 with_settings :file_max_size_displayed => 1 do
459 get :annotate, :id => PRJ_ID,
459 get :annotate, :id => PRJ_ID,
460 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
460 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
461 :rev => 'deff712f'
461 :rev => 'deff712f'
462 assert_response 500
462 assert_response 500
463 assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
463 assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
464 :content => /exceeds the maximum text file size/
464 :content => /exceeds the maximum text file size/
465
465
466 get :annotate, :id => PRJ_ID,
466 get :annotate, :id => PRJ_ID,
467 :path => repository_path_hash(['README'])[:param],
467 :path => repository_path_hash(['README'])[:param],
468 :rev => '7234cb2'
468 :rev => '7234cb2'
469 assert_response :success
469 assert_response :success
470 assert_template 'annotate'
470 assert_template 'annotate'
471 end
471 end
472 end
472 end
473
473
474 def test_annotate_latin_1
474 def test_annotate_latin_1
475 if @ruby19_non_utf8_pass
475 if @ruby19_non_utf8_pass
476 puts_ruby19_non_utf8_pass()
476 puts_ruby19_non_utf8_pass()
477 elsif WINDOWS_PASS
477 elsif WINDOWS_PASS
478 puts WINDOWS_SKIP_STR
478 puts WINDOWS_SKIP_STR
479 elsif JRUBY_SKIP
479 elsif JRUBY_SKIP
480 puts JRUBY_SKIP_STR
480 puts JRUBY_SKIP_STR
481 else
481 else
482 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
482 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
483 ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
483 ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
484 get :annotate, :id => PRJ_ID,
484 get :annotate, :id => PRJ_ID,
485 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
485 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
486 :rev => r1
486 :rev => r1
487 assert_tag :tag => 'th',
487 assert_tag :tag => 'th',
488 :content => '1',
488 :content => '1',
489 :attributes => { :class => 'line-num' },
489 :attributes => { :class => 'line-num' },
490 :sibling => { :tag => 'td',
490 :sibling => { :tag => 'td',
491 :content => /test-#{@char_1}.txt/ }
491 :content => /test-#{@char_1}.txt/ }
492 end
492 end
493 end
493 end
494 end
494 end
495 end
495 end
496
496
497 def test_revision
497 def test_revision
498 assert_equal 0, @repository.changesets.count
498 assert_equal 0, @repository.changesets.count
499 @repository.fetch_changesets
499 @repository.fetch_changesets
500 @project.reload
500 @project.reload
501 assert_equal NUM_REV, @repository.changesets.count
501 assert_equal NUM_REV, @repository.changesets.count
502 ['61b685fbe55ab05b5ac68402d5720c1a6ac973d1', '61b685f'].each do |r|
502 ['61b685fbe55ab05b5ac68402d5720c1a6ac973d1', '61b685f'].each do |r|
503 get :revision, :id => PRJ_ID, :rev => r
503 get :revision, :id => PRJ_ID, :rev => r
504 assert_response :success
504 assert_response :success
505 assert_template 'revision'
505 assert_template 'revision'
506 end
506 end
507 end
507 end
508
508
509 def test_empty_revision
509 def test_empty_revision
510 assert_equal 0, @repository.changesets.count
510 assert_equal 0, @repository.changesets.count
511 @repository.fetch_changesets
511 @repository.fetch_changesets
512 @project.reload
512 @project.reload
513 assert_equal NUM_REV, @repository.changesets.count
513 assert_equal NUM_REV, @repository.changesets.count
514 ['', ' ', nil].each do |r|
514 ['', ' ', nil].each do |r|
515 get :revision, :id => PRJ_ID, :rev => r
515 get :revision, :id => PRJ_ID, :rev => r
516 assert_response 404
516 assert_response 404
517 assert_error_tag :content => /was not found/
517 assert_error_tag :content => /was not found/
518 end
518 end
519 end
519 end
520
520
521 def test_destroy_valid_repository
521 def test_destroy_valid_repository
522 @request.session[:user_id] = 1 # admin
522 @request.session[:user_id] = 1 # admin
523 assert_equal 0, @repository.changesets.count
523 assert_equal 0, @repository.changesets.count
524 @repository.fetch_changesets
524 @repository.fetch_changesets
525 @project.reload
525 @project.reload
526 assert_equal NUM_REV, @repository.changesets.count
526 assert_equal NUM_REV, @repository.changesets.count
527
527
528 assert_difference 'Repository.count', -1 do
528 assert_difference 'Repository.count', -1 do
529 delete :destroy, :id => @repository.id
529 delete :destroy, :id => @repository.id
530 end
530 end
531 assert_response 302
531 assert_response 302
532 @project.reload
532 @project.reload
533 assert_nil @project.repository
533 assert_nil @project.repository
534 end
534 end
535
535
536 def test_destroy_invalid_repository
536 def test_destroy_invalid_repository
537 @request.session[:user_id] = 1 # admin
537 @request.session[:user_id] = 1 # admin
538 @project.repository.destroy
538 @project.repository.destroy
539 @repository = Repository::Git.create!(
539 @repository = Repository::Git.create!(
540 :project => @project,
540 :project => @project,
541 :url => "/invalid",
541 :url => "/invalid",
542 :path_encoding => 'ISO-8859-1'
542 :path_encoding => 'ISO-8859-1'
543 )
543 )
544 @repository.fetch_changesets
544 @repository.fetch_changesets
545 @repository.reload
545 @repository.reload
546 assert_equal 0, @repository.changesets.count
546 assert_equal 0, @repository.changesets.count
547
547
548 assert_difference 'Repository.count', -1 do
548 assert_difference 'Repository.count', -1 do
549 delete :destroy, :id => @repository.id
549 delete :destroy, :id => @repository.id
550 end
550 end
551 assert_response 302
551 assert_response 302
552 @project.reload
552 @project.reload
553 assert_nil @project.repository
553 assert_nil @project.repository
554 end
554 end
555
555
556 private
556 private
557
557
558 def puts_ruby19_non_utf8_pass
558 def puts_ruby19_non_utf8_pass
559 puts "TODO: This test fails in Ruby 1.9 " +
559 puts "TODO: This test fails in Ruby 1.9 " +
560 "and Encoding.default_external is not UTF-8. " +
560 "and Encoding.default_external is not UTF-8. " +
561 "Current value is '#{Encoding.default_external.to_s}'"
561 "Current value is '#{Encoding.default_external.to_s}'"
562 end
562 end
563 else
563 else
564 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
564 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
565 def test_fake; assert true end
565 def test_fake; assert true end
566 end
566 end
567
567
568 private
568 private
569 def with_cache(&block)
569 def with_cache(&block)
570 before = ActionController::Base.perform_caching
570 before = ActionController::Base.perform_caching
571 ActionController::Base.perform_caching = true
571 ActionController::Base.perform_caching = true
572 block.call
572 block.call
573 ActionController::Base.perform_caching = before
573 ActionController::Base.perform_caching = before
574 end
574 end
575 end
575 end
General Comments 0
You need to be logged in to leave comments. Login now