Skip to content

Commit dfac431

Browse files
committed
fix source indent of RepositoriesBazaarControllerTest
git-svn-id: http://svn.redmine.org/redmine/trunk@20104 e93f8b46-1217-0410-a6f0-8f06a7374b81
1 parent 9a99e8b commit dfac431

File tree

1 file changed

+82
-32
lines changed

1 file changed

+82
-32
lines changed

test/functional/repositories_bazaar_controller_test.rb

Lines changed: 82 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,39 @@ def setup
3333
super
3434
User.current = nil
3535
@project = Project.find(PRJ_ID)
36-
@repository = Repository::Bazaar.create(
37-
:project => @project,
38-
:url => REPOSITORY_PATH_TRUNK,
39-
:log_encoding => 'UTF-8')
36+
@repository =
37+
Repository::Bazaar.create(
38+
:project => @project,
39+
:url => REPOSITORY_PATH_TRUNK,
40+
:log_encoding => 'UTF-8'
41+
)
4042
assert @repository
4143
end
4244

4345
if File.directory?(REPOSITORY_PATH)
4446
def test_get_new
4547
@request.session[:user_id] = 1
4648
@project.repository.destroy
47-
get :new, :params => {
49+
get(
50+
:new,
51+
:params => {
4852
:project_id => 'subproject1',
4953
:repository_scm => 'Bazaar'
5054
}
55+
)
5156
assert_response :success
5257
assert_select 'select[name=?]', 'repository_scm' do
5358
assert_select 'option[value=?][selected=selected]', 'Bazaar'
5459
end
5560
end
5661

5762
def test_browse_root
58-
get :show, :params => {
63+
get(
64+
:show,
65+
:params => {
5966
:id => PRJ_ID
6067
}
68+
)
6169
assert_response :success
6270
assert_select 'table.entries tbody' do
6371
assert_select 'tr', 2
@@ -67,11 +75,14 @@ def test_browse_root
6775
end
6876

6977
def test_browse_directory
70-
get :show, :params => {
78+
get(
79+
:show,
80+
:params => {
7181
:id => PRJ_ID,
7282
:repository_id => @repository.id,
7383
:path => repository_path_hash(['directory'])[:param]
7484
}
85+
)
7586
assert_response :success
7687
assert_select 'table.entries tbody' do
7788
assert_select 'tr', 3
@@ -82,12 +93,15 @@ def test_browse_directory
8293
end
8394

8495
def test_browse_at_given_revision
85-
get :show, :params => {
96+
get(
97+
:show,
98+
:params => {
8699
:id => PRJ_ID,
87100
:repository_id => @repository.id,
88101
:path => repository_path_hash([])[:param],
89102
:rev => 3
90103
}
104+
)
91105
assert_response :success
92106
assert_select 'table.entries tbody' do
93107
assert_select 'tr', 4
@@ -99,69 +113,87 @@ def test_browse_at_given_revision
99113
end
100114

101115
def test_changes
102-
get :changes, :params => {
116+
get(
117+
:changes,
118+
:params => {
103119
:id => PRJ_ID,
104120
:repository_id => @repository.id,
105121
:path => repository_path_hash(['doc-mkdir.txt'])[:param]
106122
}
123+
)
107124
assert_response :success
108125
assert_select 'h2', :text => /doc-mkdir.txt/
109126
end
110127

111128
def test_entry_show
112-
get :entry, :params => {
129+
get(
130+
:entry,
131+
:params => {
113132
:id => PRJ_ID,
114133
:repository_id => @repository.id,
115134
:path => repository_path_hash(['directory', 'doc-ls.txt'])[:param]
116135
}
136+
)
117137
assert_response :success
118138
# Line 19
119139
assert_select 'tr#L29 td.line-code', :text => /Show help message/
120140
end
121141

122142
def test_entry_download
123-
get :entry, :params => {
143+
get(
144+
:entry,
145+
:params => {
124146
:id => PRJ_ID,
125147
:repository_id => @repository.id,
126148
:path => repository_path_hash(['directory', 'doc-ls.txt'])[:param],
127149
:format => 'raw'
128150
}
151+
)
129152
assert_response :success
130153
# File content
131154
assert @response.body.include?('Show help message')
132155
end
133156

134157
def test_directory_entry
135-
get :entry, :params => {
158+
get(
159+
:entry,
160+
:params => {
136161
:id => PRJ_ID,
137162
:repository_id => @repository.id,
138163
:path => repository_path_hash(['directory'])[:param]
139164
}
165+
)
140166
assert_response :success
141167
assert_select 'table.entries tbody'
142168
end
143169

144170
def test_diff
145171
# Full diff of changeset 3
146172
['inline', 'sbs'].each do |dt|
147-
get :diff, :params => {
173+
get(
174+
:diff,
175+
:params => {
148176
:id => PRJ_ID,
149177
:repository_id => @repository.id,
150178
:rev => 3,
151179
:type => dt
152180
}
181+
)
153182
assert_response :success
154183
# Line 11 removed
155184
assert_select 'th.line-num:contains(11) ~ td.diff_out', :text => /Display more information/
156185
end
157186
end
158187

159188
def test_annotate
160-
get :annotate, :params => {
189+
get(
190+
:annotate,
191+
:params => {
161192
:id => PRJ_ID,
162193
:repository_id => @repository.id,
163194
:path => repository_path_hash(['doc-mkdir.txt'])[:param]
164195
}
196+
)
165197
assert_response :success
166198

167199
assert_select "th.line-num", :text => '2' do
@@ -176,17 +208,22 @@ def test_annotate
176208
end
177209

178210
def test_annotate_author_escaping
179-
repository = Repository::Bazaar.create(
180-
:project => @project,
181-
:url => File.join(REPOSITORY_PATH, "author_escaping"),
182-
:identifier => 'author_escaping',
183-
:log_encoding => 'UTF-8')
211+
repository =
212+
Repository::Bazaar.create(
213+
:project => @project,
214+
:url => File.join(REPOSITORY_PATH, "author_escaping"),
215+
:identifier => 'author_escaping',
216+
:log_encoding => 'UTF-8'
217+
)
184218
assert repository
185-
get :annotate, :params => {
219+
get(
220+
:annotate,
221+
:params => {
186222
:id => PRJ_ID,
187223
:repository_id => 'author_escaping',
188224
:path => repository_path_hash(['author-escaping-test.txt'])[:param]
189225
}
226+
)
190227
assert_response :success
191228

192229
assert_select "th.line-num", :text => '1' do
@@ -207,17 +244,22 @@ def test_annotate_author_non_ascii
207244
log_encoding = Encoding.locale_charmap
208245
end
209246
unless log_encoding.nil?
210-
repository = Repository::Bazaar.create(
211-
:project => @project,
212-
:url => File.join(REPOSITORY_PATH, "author_non_ascii"),
213-
:identifier => 'author_non_ascii',
214-
:log_encoding => log_encoding)
247+
repository =
248+
Repository::Bazaar.create(
249+
:project => @project,
250+
:url => File.join(REPOSITORY_PATH, "author_non_ascii"),
251+
:identifier => 'author_non_ascii',
252+
:log_encoding => log_encoding
253+
)
215254
assert repository
216-
get :annotate, :params => {
255+
get(
256+
:annotate,
257+
:params => {
217258
:id => PRJ_ID,
218259
:repository_id => 'author_non_ascii',
219260
:path => repository_path_hash(['author-non-ascii-test.txt'])[:param]
220261
}
262+
)
221263
assert_response :success
222264

223265
assert_select "th.line-num", :text => '1' do
@@ -239,9 +281,12 @@ def test_destroy_valid_repository
239281
assert @repository.changesets.count > 0
240282

241283
assert_difference 'Repository.count', -1 do
242-
delete :destroy, :params => {
284+
delete(
285+
:destroy,
286+
:params => {
243287
:id => @repository.id
244288
}
289+
)
245290
end
246291
assert_response 302
247292
@project.reload
@@ -251,18 +296,23 @@ def test_destroy_valid_repository
251296
def test_destroy_invalid_repository
252297
@request.session[:user_id] = 1 # admin
253298
@project.repository.destroy
254-
@repository = Repository::Bazaar.create!(
255-
:project => @project,
256-
:url => "/invalid",
257-
:log_encoding => 'UTF-8')
299+
@repository =
300+
Repository::Bazaar.create!(
301+
:project => @project,
302+
:url => "/invalid",
303+
:log_encoding => 'UTF-8'
304+
)
258305
@repository.fetch_changesets
259306
@repository.reload
260307
assert_equal 0, @repository.changesets.count
261308

262309
assert_difference 'Repository.count', -1 do
263-
delete :destroy, :params => {
310+
delete(
311+
:destroy,
312+
:params => {
264313
:id => @repository.id
265314
}
315+
)
266316
end
267317
assert_response 302
268318
@project.reload

0 commit comments

Comments
 (0)