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