@@ -34,22 +34,26 @@ def setup
34
34
User . current = nil
35
35
Setting . enabled_scm << 'Filesystem' unless Setting . enabled_scm . include? ( 'Filesystem' )
36
36
@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
+ )
42
43
assert @repository
43
44
end
44
45
45
46
if File . directory? ( REPOSITORY_PATH )
46
47
def test_get_new
47
48
@request . session [ :user_id ] = 1
48
49
@project . repository . destroy
49
- get :new , :params => {
50
+ get (
51
+ :new ,
52
+ :params => {
50
53
:project_id => 'subproject1' ,
51
54
:repository_scm => 'Filesystem'
52
55
}
56
+ )
53
57
assert_response :success
54
58
assert_select 'select[name=?]' , 'repository_scm' do
55
59
assert_select 'option[value=?][selected=selected]' , 'Filesystem'
@@ -59,9 +63,12 @@ def test_get_new
59
63
def test_browse_root
60
64
@repository . fetch_changesets
61
65
@repository . reload
62
- get :show , :params => {
66
+ get (
67
+ :show ,
68
+ :params => {
63
69
:id => PRJ_ID
64
70
}
71
+ )
65
72
assert_response :success
66
73
67
74
assert_select 'table.entries tbody' do
@@ -79,32 +86,41 @@ def test_browse_root
79
86
end
80
87
81
88
def test_show_no_extension
82
- get :entry , :params => {
89
+ get (
90
+ :entry ,
91
+ :params => {
83
92
:id => PRJ_ID ,
84
93
:repository_id => @repository . id ,
85
94
:path => repository_path_hash ( [ 'test' ] ) [ :param ]
86
95
}
96
+ )
87
97
assert_response :success
88
98
assert_select 'tr#L1 td.line-code' , :text => /TEST CAT/
89
99
end
90
100
91
101
def test_entry_download_no_extension
92
- get :raw , :params => {
102
+ get (
103
+ :raw ,
104
+ :params => {
93
105
:id => PRJ_ID ,
94
106
:repository_id => @repository . id ,
95
107
:path => repository_path_hash ( [ 'test' ] ) [ :param ]
96
108
}
109
+ )
97
110
assert_response :success
98
111
assert_equal 'application/octet-stream' , @response . media_type
99
112
end
100
113
101
114
def test_show_non_ascii_contents
102
115
with_settings :repositories_encodings => 'UTF-8,EUC-JP' do
103
- get :entry , :params => {
116
+ get (
117
+ :entry ,
118
+ :params => {
104
119
:id => PRJ_ID ,
105
120
:repository_id => @repository . id ,
106
121
:path => repository_path_hash ( [ 'japanese' , 'euc-jp.txt' ] ) [ :param ]
107
122
}
123
+ )
108
124
assert_response :success
109
125
assert_select 'tr#L2 td.line-code' , :text => /japanese/
110
126
if @ruby19_non_utf8_pass
@@ -120,23 +136,29 @@ def test_show_non_ascii_contents
120
136
def test_show_utf16
121
137
enc = 'UTF-16'
122
138
with_settings :repositories_encodings => enc do
123
- get :entry , :params => {
139
+ get (
140
+ :entry ,
141
+ :params => {
124
142
:id => PRJ_ID ,
125
143
:repository_id => @repository . id ,
126
144
:path => repository_path_hash ( [ 'japanese' , 'utf-16.txt' ] ) [ :param ]
127
145
}
146
+ )
128
147
assert_response :success
129
148
assert_select 'tr#L2 td.line-code' , :text => /japanese/
130
149
end
131
150
end
132
151
133
152
def test_show_text_file_should_show_other_if_too_big
134
153
with_settings :file_max_size_displayed => 1 do
135
- get :entry , :params => {
154
+ get (
155
+ :entry ,
156
+ :params => {
136
157
:id => PRJ_ID ,
137
158
:repository_id => @repository . id ,
138
159
:path => repository_path_hash ( [ 'japanese' , 'big-file.txt' ] ) [ :param ]
139
160
}
161
+ )
140
162
assert_response :success
141
163
assert_equal 'text/html' , @response . media_type
142
164
assert_select 'p.nodata'
@@ -147,9 +169,12 @@ def test_destroy_valid_repository
147
169
@request . session [ :user_id ] = 1 # admin
148
170
149
171
assert_difference 'Repository.count' , -1 do
150
- delete :destroy , :params => {
172
+ delete (
173
+ :destroy ,
174
+ :params => {
151
175
:id => @repository . id
152
176
}
177
+ )
153
178
end
154
179
assert_response 302
155
180
@project . reload
@@ -159,16 +184,19 @@ def test_destroy_valid_repository
159
184
def test_destroy_invalid_repository
160
185
@request . session [ :user_id ] = 1 # admin
161
186
@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
+ )
168
193
assert_difference 'Repository.count' , -1 do
169
- delete :destroy , :params => {
194
+ delete (
195
+ :destroy ,
196
+ :params => {
170
197
:id => @repository . id
171
198
}
199
+ )
172
200
end
173
201
assert_response 302
174
202
@project . reload
0 commit comments