##// END OF EJS Templates
Merged r10709 from trunk to 2.1-stable (#12196)...
Toshi MARUYAMA -
r10498:c05002810224
parent child
Show More
@@ -1,33 +1,34
1 <div class="contextual">
1 <div class="contextual">
2 <%= form_tag(
2 <%= form_tag(
3 {:controller => 'repositories', :action => 'revision', :id => @project,
3 {:controller => 'repositories', :action => 'revision', :id => @project,
4 :repository_id => @repository.identifier_param}
4 :repository_id => @repository.identifier_param},
5 :method => :get
5 ) do %>
6 ) do %>
6 <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
7 <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
7 <%= submit_tag 'OK' %>
8 <%= submit_tag 'OK' %>
8 <% end %>
9 <% end %>
9 </div>
10 </div>
10
11
11 <h2><%= l(:label_revision_plural) %></h2>
12 <h2><%= l(:label_revision_plural) %></h2>
12
13
13 <%= render :partial => 'revisions',
14 <%= render :partial => 'revisions',
14 :locals => {:project => @project,
15 :locals => {:project => @project,
15 :path => '',
16 :path => '',
16 :revisions => @changesets,
17 :revisions => @changesets,
17 :entry => nil } %>
18 :entry => nil } %>
18
19
19 <p class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></p>
20 <p class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></p>
20
21
21 <% content_for :header_tags do %>
22 <% content_for :header_tags do %>
22 <%= stylesheet_link_tag "scm" %>
23 <%= stylesheet_link_tag "scm" %>
23 <%= auto_discovery_link_tag(
24 <%= auto_discovery_link_tag(
24 :atom,
25 :atom,
25 params.merge(
26 params.merge(
26 {:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
27 {:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
27 <% end %>
28 <% end %>
28
29
29 <% other_formats_links do |f| %>
30 <% other_formats_links do |f| %>
30 <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
31 <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
31 <% end %>
32 <% end %>
32
33
33 <% html_title(l(:label_revision_plural)) -%>
34 <% html_title(l(:label_revision_plural)) -%>
@@ -1,613 +1,628
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
264 assert_equal true, @repository.is_default
265 assert_nil @repository.identifier
265 assert_nil @repository.identifier
266 assert_equal 0, @repository.changesets.count
266 assert_equal 0, @repository.changesets.count
267 @repository.fetch_changesets
267 @repository.fetch_changesets
268 @project.reload
268 @project.reload
269 assert_equal NUM_REV, @repository.changesets.count
269 assert_equal NUM_REV, @repository.changesets.count
270 # Full diff of changeset 2f9c0091
270 # Full diff of changeset 2f9c0091
271 ['inline', 'sbs'].each do |dt|
271 ['inline', 'sbs'].each do |dt|
272 get :diff,
272 get :diff,
273 :id => PRJ_ID,
273 :id => PRJ_ID,
274 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
274 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
275 :type => dt
275 :type => dt
276 assert_response :success
276 assert_response :success
277 assert_template 'diff'
277 assert_template 'diff'
278 # Line 22 removed
278 # Line 22 removed
279 assert_tag :tag => 'th',
279 assert_tag :tag => 'th',
280 :content => /22/,
280 :content => /22/,
281 :sibling => { :tag => 'td',
281 :sibling => { :tag => 'td',
282 :attributes => { :class => /diff_out/ },
282 :attributes => { :class => /diff_out/ },
283 :content => /def remove/ }
283 :content => /def remove/ }
284 assert_tag :tag => 'h2', :content => /2f9c0091/
284 assert_tag :tag => 'h2', :content => /2f9c0091/
285 end
285 end
286 end
286 end
287
287
288 def test_diff_with_rev_and_path
288 def test_diff_with_rev_and_path
289 assert_equal 0, @repository.changesets.count
289 assert_equal 0, @repository.changesets.count
290 @repository.fetch_changesets
290 @repository.fetch_changesets
291 @project.reload
291 @project.reload
292 assert_equal NUM_REV, @repository.changesets.count
292 assert_equal NUM_REV, @repository.changesets.count
293 with_settings :diff_max_lines_displayed => 1000 do
293 with_settings :diff_max_lines_displayed => 1000 do
294 # Full diff of changeset 2f9c0091
294 # Full diff of changeset 2f9c0091
295 ['inline', 'sbs'].each do |dt|
295 ['inline', 'sbs'].each do |dt|
296 get :diff,
296 get :diff,
297 :id => PRJ_ID,
297 :id => PRJ_ID,
298 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
298 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
299 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
299 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
300 :type => dt
300 :type => dt
301 assert_response :success
301 assert_response :success
302 assert_template 'diff'
302 assert_template 'diff'
303 # Line 22 removed
303 # Line 22 removed
304 assert_tag :tag => 'th',
304 assert_tag :tag => 'th',
305 :content => '22',
305 :content => '22',
306 :sibling => { :tag => 'td',
306 :sibling => { :tag => 'td',
307 :attributes => { :class => /diff_out/ },
307 :attributes => { :class => /diff_out/ },
308 :content => /def remove/ }
308 :content => /def remove/ }
309 assert_tag :tag => 'h2', :content => /2f9c0091/
309 assert_tag :tag => 'h2', :content => /2f9c0091/
310 end
310 end
311 end
311 end
312 end
312 end
313
313
314 def test_diff_truncated
314 def test_diff_truncated
315 assert_equal 0, @repository.changesets.count
315 assert_equal 0, @repository.changesets.count
316 @repository.fetch_changesets
316 @repository.fetch_changesets
317 @project.reload
317 @project.reload
318 assert_equal NUM_REV, @repository.changesets.count
318 assert_equal NUM_REV, @repository.changesets.count
319
319
320 with_settings :diff_max_lines_displayed => 5 do
320 with_settings :diff_max_lines_displayed => 5 do
321 # Truncated diff of changeset 2f9c0091
321 # Truncated diff of changeset 2f9c0091
322 with_cache do
322 with_cache do
323 with_settings :default_language => 'en' do
323 with_settings :default_language => 'en' do
324 get :diff, :id => PRJ_ID, :type => 'inline',
324 get :diff, :id => PRJ_ID, :type => 'inline',
325 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
325 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
326 assert_response :success
326 assert_response :success
327 assert @response.body.include?("... This diff was truncated")
327 assert @response.body.include?("... This diff was truncated")
328 end
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 assert_tag :tag => "form",
356 assert_tag :tag => "form",
357 :attributes => {
357 :attributes => {
358 :action => "/projects/subproject1/repository/revisions/" +
358 :action => "/projects/subproject1/repository/revisions/" +
359 "61b685fbe55ab05b5ac68402d5720c1a6ac973d1/diff"
359 "61b685fbe55ab05b5ac68402d5720c1a6ac973d1/diff"
360 }
360 }
361 assert_tag :tag => 'input',
361 assert_tag :tag => 'input',
362 :attributes => {
362 :attributes => {
363 :id => "rev_to",
363 :id => "rev_to",
364 :name => "rev_to",
364 :name => "rev_to",
365 :type => "hidden",
365 :type => "hidden",
366 :value => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
366 :value => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
367 }
367 }
368 end
368 end
369 end
369 end
370
370
371 def test_diff_path_in_subrepo
371 def test_diff_path_in_subrepo
372 repo = Repository::Git.create(
372 repo = Repository::Git.create(
373 :project => @project,
373 :project => @project,
374 :url => REPOSITORY_PATH,
374 :url => REPOSITORY_PATH,
375 :identifier => 'test-diff-path',
375 :identifier => 'test-diff-path',
376 :path_encoding => 'ISO-8859-1'
376 :path_encoding => 'ISO-8859-1'
377 );
377 );
378 assert repo
378 assert repo
379 assert_equal false, repo.is_default
379 assert_equal false, repo.is_default
380 assert_equal 'test-diff-path', repo.identifier
380 assert_equal 'test-diff-path', repo.identifier
381 get :diff,
381 get :diff,
382 :id => PRJ_ID,
382 :id => PRJ_ID,
383 :repository_id => 'test-diff-path',
383 :repository_id => 'test-diff-path',
384 :rev => '61b685fbe55ab05b',
384 :rev => '61b685fbe55ab05b',
385 :rev_to => '2f9c0091c754a91a',
385 :rev_to => '2f9c0091c754a91a',
386 :type => 'inline'
386 :type => 'inline'
387 assert_response :success
387 assert_response :success
388 assert_template 'diff'
388 assert_template 'diff'
389 diff = assigns(:diff)
389 diff = assigns(:diff)
390 assert_not_nil diff
390 assert_not_nil diff
391 assert_tag :tag => "form",
391 assert_tag :tag => "form",
392 :attributes => {
392 :attributes => {
393 :action => "/projects/subproject1/repository/test-diff-path/" +
393 :action => "/projects/subproject1/repository/test-diff-path/" +
394 "revisions/61b685fbe55ab05b/diff"
394 "revisions/61b685fbe55ab05b/diff"
395 }
395 }
396 assert_tag :tag => 'input',
396 assert_tag :tag => 'input',
397 :attributes => {
397 :attributes => {
398 :id => "rev_to",
398 :id => "rev_to",
399 :name => "rev_to",
399 :name => "rev_to",
400 :type => "hidden",
400 :type => "hidden",
401 :value => '2f9c0091c754a91a'
401 :value => '2f9c0091c754a91a'
402 }
402 }
403 end
403 end
404
404
405 def test_diff_latin_1
405 def test_diff_latin_1
406 if @ruby19_non_utf8_pass
406 if @ruby19_non_utf8_pass
407 puts_ruby19_non_utf8_pass()
407 puts_ruby19_non_utf8_pass()
408 else
408 else
409 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
409 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
410 ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
410 ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
411 ['inline', 'sbs'].each do |dt|
411 ['inline', 'sbs'].each do |dt|
412 get :diff, :id => PRJ_ID, :rev => r1, :type => dt
412 get :diff, :id => PRJ_ID, :rev => r1, :type => dt
413 assert_response :success
413 assert_response :success
414 assert_template 'diff'
414 assert_template 'diff'
415 assert_tag :tag => 'thead',
415 assert_tag :tag => 'thead',
416 :descendant => {
416 :descendant => {
417 :tag => 'th',
417 :tag => 'th',
418 :attributes => { :class => 'filename' } ,
418 :attributes => { :class => 'filename' } ,
419 :content => /latin-1-dir\/test-#{@char_1}.txt/ ,
419 :content => /latin-1-dir\/test-#{@char_1}.txt/ ,
420 },
420 },
421 :sibling => {
421 :sibling => {
422 :tag => 'tbody',
422 :tag => 'tbody',
423 :descendant => {
423 :descendant => {
424 :tag => 'td',
424 :tag => 'td',
425 :attributes => { :class => /diff_in/ },
425 :attributes => { :class => /diff_in/ },
426 :content => /test-#{@char_1}.txt/
426 :content => /test-#{@char_1}.txt/
427 }
427 }
428 }
428 }
429 end
429 end
430 end
430 end
431 end
431 end
432 end
432 end
433 end
433 end
434
434
435 def test_save_diff_type
435 def test_save_diff_type
436 user1 = User.find(1)
436 user1 = User.find(1)
437 user1.pref[:diff_type] = nil
437 user1.pref[:diff_type] = nil
438 user1.preference.save
438 user1.preference.save
439 user = User.find(1)
439 user = User.find(1)
440 assert_nil user.pref[:diff_type]
440 assert_nil user.pref[:diff_type]
441
441
442 @request.session[:user_id] = 1 # admin
442 @request.session[:user_id] = 1 # admin
443 get :diff,
443 get :diff,
444 :id => PRJ_ID,
444 :id => PRJ_ID,
445 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
445 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
446 assert_response :success
446 assert_response :success
447 assert_template 'diff'
447 assert_template 'diff'
448 user.reload
448 user.reload
449 assert_equal "inline", user.pref[:diff_type]
449 assert_equal "inline", user.pref[:diff_type]
450 get :diff,
450 get :diff,
451 :id => PRJ_ID,
451 :id => PRJ_ID,
452 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
452 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
453 :type => 'sbs'
453 :type => 'sbs'
454 assert_response :success
454 assert_response :success
455 assert_template 'diff'
455 assert_template 'diff'
456 user.reload
456 user.reload
457 assert_equal "sbs", user.pref[:diff_type]
457 assert_equal "sbs", user.pref[:diff_type]
458 end
458 end
459
459
460 def test_annotate
460 def test_annotate
461 get :annotate, :id => PRJ_ID,
461 get :annotate, :id => PRJ_ID,
462 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
462 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
463 assert_response :success
463 assert_response :success
464 assert_template 'annotate'
464 assert_template 'annotate'
465
465
466 # Line 23, changeset 2f9c0091
466 # Line 23, changeset 2f9c0091
467 assert_select 'tr' do
467 assert_select 'tr' do
468 assert_select 'th.line-num', :text => '23'
468 assert_select 'th.line-num', :text => '23'
469 assert_select 'td.revision', :text => /2f9c0091/
469 assert_select 'td.revision', :text => /2f9c0091/
470 assert_select 'td.author', :text => 'jsmith'
470 assert_select 'td.author', :text => 'jsmith'
471 assert_select 'td', :text => /remove_watcher/
471 assert_select 'td', :text => /remove_watcher/
472 end
472 end
473 end
473 end
474
474
475 def test_annotate_at_given_revision
475 def test_annotate_at_given_revision
476 assert_equal 0, @repository.changesets.count
476 assert_equal 0, @repository.changesets.count
477 @repository.fetch_changesets
477 @repository.fetch_changesets
478 @project.reload
478 @project.reload
479 assert_equal NUM_REV, @repository.changesets.count
479 assert_equal NUM_REV, @repository.changesets.count
480 get :annotate, :id => PRJ_ID, :rev => 'deff7',
480 get :annotate, :id => PRJ_ID, :rev => 'deff7',
481 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
481 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
482 assert_response :success
482 assert_response :success
483 assert_template 'annotate'
483 assert_template 'annotate'
484 assert_tag :tag => 'h2', :content => /@ deff712f/
484 assert_tag :tag => 'h2', :content => /@ deff712f/
485 end
485 end
486
486
487 def test_annotate_binary_file
487 def test_annotate_binary_file
488 get :annotate, :id => PRJ_ID,
488 get :annotate, :id => PRJ_ID,
489 :path => repository_path_hash(['images', 'edit.png'])[:param]
489 :path => repository_path_hash(['images', 'edit.png'])[:param]
490 assert_response 500
490 assert_response 500
491 assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
491 assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
492 :content => /cannot be annotated/
492 :content => /cannot be annotated/
493 end
493 end
494
494
495 def test_annotate_error_when_too_big
495 def test_annotate_error_when_too_big
496 with_settings :file_max_size_displayed => 1 do
496 with_settings :file_max_size_displayed => 1 do
497 get :annotate, :id => PRJ_ID,
497 get :annotate, :id => PRJ_ID,
498 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
498 :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
499 :rev => 'deff712f'
499 :rev => 'deff712f'
500 assert_response 500
500 assert_response 500
501 assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
501 assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
502 :content => /exceeds the maximum text file size/
502 :content => /exceeds the maximum text file size/
503
503
504 get :annotate, :id => PRJ_ID,
504 get :annotate, :id => PRJ_ID,
505 :path => repository_path_hash(['README'])[:param],
505 :path => repository_path_hash(['README'])[:param],
506 :rev => '7234cb2'
506 :rev => '7234cb2'
507 assert_response :success
507 assert_response :success
508 assert_template 'annotate'
508 assert_template 'annotate'
509 end
509 end
510 end
510 end
511
511
512 def test_annotate_latin_1
512 def test_annotate_latin_1
513 if @ruby19_non_utf8_pass
513 if @ruby19_non_utf8_pass
514 puts_ruby19_non_utf8_pass()
514 puts_ruby19_non_utf8_pass()
515 elsif WINDOWS_PASS
515 elsif WINDOWS_PASS
516 puts WINDOWS_SKIP_STR
516 puts WINDOWS_SKIP_STR
517 elsif JRUBY_SKIP
517 elsif JRUBY_SKIP
518 puts JRUBY_SKIP_STR
518 puts JRUBY_SKIP_STR
519 else
519 else
520 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
520 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
521 ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
521 ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
522 get :annotate, :id => PRJ_ID,
522 get :annotate, :id => PRJ_ID,
523 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
523 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
524 :rev => r1
524 :rev => r1
525 assert_tag :tag => 'th',
525 assert_tag :tag => 'th',
526 :content => '1',
526 :content => '1',
527 :attributes => { :class => 'line-num' },
527 :attributes => { :class => 'line-num' },
528 :sibling => { :tag => 'td',
528 :sibling => { :tag => 'td',
529 :content => /test-#{@char_1}.txt/ }
529 :content => /test-#{@char_1}.txt/ }
530 end
530 end
531 end
531 end
532 end
532 end
533 end
533 end
534
534
535 def test_revisions
536 assert_equal 0, @repository.changesets.count
537 @repository.fetch_changesets
538 @project.reload
539 assert_equal NUM_REV, @repository.changesets.count
540 get :revisions, :id => PRJ_ID
541 assert_response :success
542 assert_template 'revisions'
543 assert_tag :tag => 'form',
544 :attributes => {
545 :method => 'get',
546 :action => '/projects/subproject1/repository/revision'
547 }
548 end
549
535 def test_revision
550 def test_revision
536 assert_equal 0, @repository.changesets.count
551 assert_equal 0, @repository.changesets.count
537 @repository.fetch_changesets
552 @repository.fetch_changesets
538 @project.reload
553 @project.reload
539 assert_equal NUM_REV, @repository.changesets.count
554 assert_equal NUM_REV, @repository.changesets.count
540 ['61b685fbe55ab05b5ac68402d5720c1a6ac973d1', '61b685f'].each do |r|
555 ['61b685fbe55ab05b5ac68402d5720c1a6ac973d1', '61b685f'].each do |r|
541 get :revision, :id => PRJ_ID, :rev => r
556 get :revision, :id => PRJ_ID, :rev => r
542 assert_response :success
557 assert_response :success
543 assert_template 'revision'
558 assert_template 'revision'
544 end
559 end
545 end
560 end
546
561
547 def test_empty_revision
562 def test_empty_revision
548 assert_equal 0, @repository.changesets.count
563 assert_equal 0, @repository.changesets.count
549 @repository.fetch_changesets
564 @repository.fetch_changesets
550 @project.reload
565 @project.reload
551 assert_equal NUM_REV, @repository.changesets.count
566 assert_equal NUM_REV, @repository.changesets.count
552 ['', ' ', nil].each do |r|
567 ['', ' ', nil].each do |r|
553 get :revision, :id => PRJ_ID, :rev => r
568 get :revision, :id => PRJ_ID, :rev => r
554 assert_response 404
569 assert_response 404
555 assert_error_tag :content => /was not found/
570 assert_error_tag :content => /was not found/
556 end
571 end
557 end
572 end
558
573
559 def test_destroy_valid_repository
574 def test_destroy_valid_repository
560 @request.session[:user_id] = 1 # admin
575 @request.session[:user_id] = 1 # admin
561 assert_equal 0, @repository.changesets.count
576 assert_equal 0, @repository.changesets.count
562 @repository.fetch_changesets
577 @repository.fetch_changesets
563 @project.reload
578 @project.reload
564 assert_equal NUM_REV, @repository.changesets.count
579 assert_equal NUM_REV, @repository.changesets.count
565
580
566 assert_difference 'Repository.count', -1 do
581 assert_difference 'Repository.count', -1 do
567 delete :destroy, :id => @repository.id
582 delete :destroy, :id => @repository.id
568 end
583 end
569 assert_response 302
584 assert_response 302
570 @project.reload
585 @project.reload
571 assert_nil @project.repository
586 assert_nil @project.repository
572 end
587 end
573
588
574 def test_destroy_invalid_repository
589 def test_destroy_invalid_repository
575 @request.session[:user_id] = 1 # admin
590 @request.session[:user_id] = 1 # admin
576 @project.repository.destroy
591 @project.repository.destroy
577 @repository = Repository::Git.create!(
592 @repository = Repository::Git.create!(
578 :project => @project,
593 :project => @project,
579 :url => "/invalid",
594 :url => "/invalid",
580 :path_encoding => 'ISO-8859-1'
595 :path_encoding => 'ISO-8859-1'
581 )
596 )
582 @repository.fetch_changesets
597 @repository.fetch_changesets
583 @repository.reload
598 @repository.reload
584 assert_equal 0, @repository.changesets.count
599 assert_equal 0, @repository.changesets.count
585
600
586 assert_difference 'Repository.count', -1 do
601 assert_difference 'Repository.count', -1 do
587 delete :destroy, :id => @repository.id
602 delete :destroy, :id => @repository.id
588 end
603 end
589 assert_response 302
604 assert_response 302
590 @project.reload
605 @project.reload
591 assert_nil @project.repository
606 assert_nil @project.repository
592 end
607 end
593
608
594 private
609 private
595
610
596 def puts_ruby19_non_utf8_pass
611 def puts_ruby19_non_utf8_pass
597 puts "TODO: This test fails in Ruby 1.9 " +
612 puts "TODO: This test fails in Ruby 1.9 " +
598 "and Encoding.default_external is not UTF-8. " +
613 "and Encoding.default_external is not UTF-8. " +
599 "Current value is '#{Encoding.default_external.to_s}'"
614 "Current value is '#{Encoding.default_external.to_s}'"
600 end
615 end
601 else
616 else
602 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
617 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
603 def test_fake; assert true end
618 def test_fake; assert true end
604 end
619 end
605
620
606 private
621 private
607 def with_cache(&block)
622 def with_cache(&block)
608 before = ActionController::Base.perform_caching
623 before = ActionController::Base.perform_caching
609 ActionController::Base.perform_caching = true
624 ActionController::Base.perform_caching = true
610 block.call
625 block.call
611 ActionController::Base.perform_caching = before
626 ActionController::Base.perform_caching = before
612 end
627 end
613 end
628 end
General Comments 0
You need to be logged in to leave comments. Login now