Skip to content

Commit 6def994

Browse files
committed
fix source indent of RepositoriesFilesystemControllerTest
git-svn-id: http://svn.redmine.org/redmine/trunk@20105 e93f8b46-1217-0410-a6f0-8f06a7374b81
1 parent dfac431 commit 6def994

File tree

1 file changed

+48
-20
lines changed

1 file changed

+48
-20
lines changed

test/functional/repositories_filesystem_controller_test.rb

Lines changed: 48 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,26 @@ def setup
3434
User.current = nil
3535
Setting.enabled_scm << 'Filesystem' unless Setting.enabled_scm.include?('Filesystem')
3636
@project = Project.find(PRJ_ID)
37-
@repository = Repository::Filesystem.create(
38-
:project => @project,
39-
:url => REPOSITORY_PATH,
40-
:path_encoding => ''
41-
)
37+
@repository =
38+
Repository::Filesystem.create(
39+
:project => @project,
40+
:url => REPOSITORY_PATH,
41+
:path_encoding => ''
42+
)
4243
assert @repository
4344
end
4445

4546
if File.directory?(REPOSITORY_PATH)
4647
def test_get_new
4748
@request.session[:user_id] = 1
4849
@project.repository.destroy
49-
get :new, :params => {
50+
get(
51+
:new,
52+
:params => {
5053
:project_id => 'subproject1',
5154
:repository_scm => 'Filesystem'
5255
}
56+
)
5357
assert_response :success
5458
assert_select 'select[name=?]', 'repository_scm' do
5559
assert_select 'option[value=?][selected=selected]', 'Filesystem'
@@ -59,9 +63,12 @@ def test_get_new
5963
def test_browse_root
6064
@repository.fetch_changesets
6165
@repository.reload
62-
get :show, :params => {
66+
get(
67+
:show,
68+
:params => {
6369
:id => PRJ_ID
6470
}
71+
)
6572
assert_response :success
6673

6774
assert_select 'table.entries tbody' do
@@ -79,32 +86,41 @@ def test_browse_root
7986
end
8087

8188
def test_show_no_extension
82-
get :entry, :params => {
89+
get(
90+
:entry,
91+
:params => {
8392
:id => PRJ_ID,
8493
:repository_id => @repository.id,
8594
:path => repository_path_hash(['test'])[:param]
8695
}
96+
)
8797
assert_response :success
8898
assert_select 'tr#L1 td.line-code', :text => /TEST CAT/
8999
end
90100

91101
def test_entry_download_no_extension
92-
get :raw, :params => {
102+
get(
103+
:raw,
104+
:params => {
93105
:id => PRJ_ID,
94106
:repository_id => @repository.id,
95107
:path => repository_path_hash(['test'])[:param]
96108
}
109+
)
97110
assert_response :success
98111
assert_equal 'application/octet-stream', @response.media_type
99112
end
100113

101114
def test_show_non_ascii_contents
102115
with_settings :repositories_encodings => 'UTF-8,EUC-JP' do
103-
get :entry, :params => {
116+
get(
117+
:entry,
118+
:params => {
104119
:id => PRJ_ID,
105120
:repository_id => @repository.id,
106121
:path => repository_path_hash(['japanese', 'euc-jp.txt'])[:param]
107122
}
123+
)
108124
assert_response :success
109125
assert_select 'tr#L2 td.line-code', :text => /japanese/
110126
if @ruby19_non_utf8_pass
@@ -120,23 +136,29 @@ def test_show_non_ascii_contents
120136
def test_show_utf16
121137
enc = 'UTF-16'
122138
with_settings :repositories_encodings => enc do
123-
get :entry, :params => {
139+
get(
140+
:entry,
141+
:params => {
124142
:id => PRJ_ID,
125143
:repository_id => @repository.id,
126144
:path => repository_path_hash(['japanese', 'utf-16.txt'])[:param]
127145
}
146+
)
128147
assert_response :success
129148
assert_select 'tr#L2 td.line-code', :text => /japanese/
130149
end
131150
end
132151

133152
def test_show_text_file_should_show_other_if_too_big
134153
with_settings :file_max_size_displayed => 1 do
135-
get :entry, :params => {
154+
get(
155+
:entry,
156+
:params => {
136157
:id => PRJ_ID,
137158
:repository_id => @repository.id,
138159
:path => repository_path_hash(['japanese', 'big-file.txt'])[:param]
139160
}
161+
)
140162
assert_response :success
141163
assert_equal 'text/html', @response.media_type
142164
assert_select 'p.nodata'
@@ -147,9 +169,12 @@ def test_destroy_valid_repository
147169
@request.session[:user_id] = 1 # admin
148170

149171
assert_difference 'Repository.count', -1 do
150-
delete :destroy, :params => {
172+
delete(
173+
:destroy,
174+
:params => {
151175
:id => @repository.id
152176
}
177+
)
153178
end
154179
assert_response 302
155180
@project.reload
@@ -159,16 +184,19 @@ def test_destroy_valid_repository
159184
def test_destroy_invalid_repository
160185
@request.session[:user_id] = 1 # admin
161186
@project.repository.destroy
162-
@repository = Repository::Filesystem.create!(
163-
:project => @project,
164-
:url => "/invalid",
165-
:path_encoding => ''
166-
)
167-
187+
@repository =
188+
Repository::Filesystem.create!(
189+
:project => @project,
190+
:url => "/invalid",
191+
:path_encoding => ''
192+
)
168193
assert_difference 'Repository.count', -1 do
169-
delete :destroy, :params => {
194+
delete(
195+
:destroy,
196+
:params => {
170197
:id => @repository.id
171198
}
199+
)
172200
end
173201
assert_response 302
174202
@project.reload

0 commit comments

Comments
 (0)