@@ -49,7 +49,7 @@ def setup
49
49
def test_truth
50
50
end
51
51
52
- def assert_asset_url ( url )
52
+ def assert_servable_asset_url ( url )
53
53
path , query = url . split ( "?" , 2 )
54
54
path = path . sub ( @view . assets_prefix , "" )
55
55
@@ -213,7 +213,7 @@ def test_javascript_include_tag
213
213
assert_equal %(<script src="/assets/foo.js"></script>) ,
214
214
@view . javascript_include_tag ( :foo )
215
215
216
- assert_asset_url "/assets/foo.js"
216
+ assert_servable_asset_url "/assets/foo.js"
217
217
end
218
218
219
219
def test_stylesheet_link_tag
@@ -226,21 +226,21 @@ def test_stylesheet_link_tag
226
226
assert_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />) ,
227
227
@view . stylesheet_link_tag ( :foo )
228
228
229
- assert_asset_url "/assets/foo.css"
229
+ assert_servable_asset_url "/assets/foo.css"
230
230
end
231
231
232
232
def test_javascript_path
233
233
super
234
234
235
235
assert_equal "/assets/foo.js" , @view . javascript_path ( "foo" )
236
- assert_asset_url "/assets/foo.js"
236
+ assert_servable_asset_url "/assets/foo.js"
237
237
end
238
238
239
239
def test_stylesheet_path
240
240
super
241
241
242
242
assert_equal "/assets/foo.css" , @view . stylesheet_path ( "foo" )
243
- assert_asset_url "/assets/foo.css"
243
+ assert_servable_asset_url "/assets/foo.css"
244
244
end
245
245
246
246
def test_asset_digest
@@ -271,7 +271,7 @@ def test_javascript_include_tag
271
271
assert_equal %(<script src="/assets/foo-#{ @foo_js_digest } .js"></script>) ,
272
272
@view . javascript_include_tag ( :foo )
273
273
274
- assert_asset_url "/assets/foo-#{ @foo_js_digest } .js"
274
+ assert_servable_asset_url "/assets/foo-#{ @foo_js_digest } .js"
275
275
end
276
276
277
277
def test_stylesheet_link_tag
@@ -284,21 +284,21 @@ def test_stylesheet_link_tag
284
284
assert_equal %(<link href="/assets/foo-#{ @foo_css_digest } .css" media="screen" rel="stylesheet" />) ,
285
285
@view . stylesheet_link_tag ( :foo )
286
286
287
- assert_asset_url "/assets/foo-#{ @foo_css_digest } .css"
287
+ assert_servable_asset_url "/assets/foo-#{ @foo_css_digest } .css"
288
288
end
289
289
290
290
def test_javascript_path
291
291
super
292
292
293
293
assert_equal "/assets/foo-#{ @foo_js_digest } .js" , @view . javascript_path ( "foo" )
294
- assert_asset_url "/assets/foo-#{ @foo_js_digest } .js"
294
+ assert_servable_asset_url "/assets/foo-#{ @foo_js_digest } .js"
295
295
end
296
296
297
297
def test_stylesheet_path
298
298
super
299
299
300
300
assert_equal "/assets/foo-#{ @foo_css_digest } .css" , @view . stylesheet_path ( "foo" )
301
- assert_asset_url "/assets/foo-#{ @foo_css_digest } .css"
301
+ assert_servable_asset_url "/assets/foo-#{ @foo_css_digest } .css"
302
302
end
303
303
304
304
def test_asset_digest
@@ -333,11 +333,11 @@ def test_javascript_include_tag
333
333
assert_equal %(<script src="/assets/dependency.js?body=1"></script>\n <script src="/assets/file1.js?body=1"></script>\n <script src="/assets/file2.js?body=1"></script>) ,
334
334
@view . javascript_include_tag ( :file1 , :file2 )
335
335
336
- assert_asset_url "/assets/foo.js?body=1"
337
- assert_asset_url "/assets/bar.js?body=1"
338
- assert_asset_url "/assets/dependency.js?body=1"
339
- assert_asset_url "/assets/file1.js?body=1"
340
- assert_asset_url "/assets/file2.js?body=1"
336
+ assert_servable_asset_url "/assets/foo.js?body=1"
337
+ assert_servable_asset_url "/assets/bar.js?body=1"
338
+ assert_servable_asset_url "/assets/dependency.js?body=1"
339
+ assert_servable_asset_url "/assets/file1.js?body=1"
340
+ assert_servable_asset_url "/assets/file2.js?body=1"
341
341
end
342
342
343
343
def test_stylesheet_link_tag
@@ -350,25 +350,25 @@ def test_stylesheet_link_tag
350
350
assert_equal %(<link href="/assets/dependency.css?body=1" media="screen" rel="stylesheet" />\n <link href="/assets/file1.css?body=1" media="screen" rel="stylesheet" />\n <link href="/assets/file2.css?body=1" media="screen" rel="stylesheet" />) ,
351
351
@view . stylesheet_link_tag ( :file1 , :file2 )
352
352
353
- assert_asset_url "/assets/foo.css?body=1"
354
- assert_asset_url "/assets/bar.css?body=1"
355
- assert_asset_url "/assets/dependency.css?body=1"
356
- assert_asset_url "/assets/file1.css?body=1"
357
- assert_asset_url "/assets/file2.css?body=1"
353
+ assert_servable_asset_url "/assets/foo.css?body=1"
354
+ assert_servable_asset_url "/assets/bar.css?body=1"
355
+ assert_servable_asset_url "/assets/dependency.css?body=1"
356
+ assert_servable_asset_url "/assets/file1.css?body=1"
357
+ assert_servable_asset_url "/assets/file2.css?body=1"
358
358
end
359
359
360
360
def test_javascript_path
361
361
super
362
362
363
363
assert_equal "/assets/foo.js" , @view . javascript_path ( "foo" )
364
- assert_asset_url "/assets/foo.js"
364
+ assert_servable_asset_url "/assets/foo.js"
365
365
end
366
366
367
367
def test_stylesheet_path
368
368
super
369
369
370
370
assert_equal "/assets/foo.css" , @view . stylesheet_path ( "foo" )
371
- assert_asset_url "/assets/foo.css"
371
+ assert_servable_asset_url "/assets/foo.css"
372
372
end
373
373
end
374
374
@@ -390,11 +390,11 @@ def test_javascript_include_tag
390
390
assert_equal %(<script src="/assets/dependency-#{ @dependency_js_digest } .js?body=1"></script>\n <script src="/assets/file1-#{ @file1_js_digest } .js?body=1"></script>\n <script src="/assets/file2-#{ @file1_js_digest } .js?body=1"></script>) ,
391
391
@view . javascript_include_tag ( :file1 , :file2 )
392
392
393
- assert_asset_url "/assets/foo-#{ @foo_js_digest } .js?body=1"
394
- assert_asset_url "/assets/bar-#{ @bar_js_digest } .js?body=1"
395
- assert_asset_url "/assets/dependency-#{ @dependency_js_digest } .js?body=1"
396
- assert_asset_url "/assets/file1-#{ @file1_js_digest } .js?body=1"
397
- assert_asset_url "/assets/file2-#{ @file2_js_digest } .js?body=1"
393
+ assert_servable_asset_url "/assets/foo-#{ @foo_js_digest } .js?body=1"
394
+ assert_servable_asset_url "/assets/bar-#{ @bar_js_digest } .js?body=1"
395
+ assert_servable_asset_url "/assets/dependency-#{ @dependency_js_digest } .js?body=1"
396
+ assert_servable_asset_url "/assets/file1-#{ @file1_js_digest } .js?body=1"
397
+ assert_servable_asset_url "/assets/file2-#{ @file2_js_digest } .js?body=1"
398
398
end
399
399
400
400
def test_stylesheet_link_tag
@@ -407,25 +407,25 @@ def test_stylesheet_link_tag
407
407
assert_equal %(<link href="/assets/dependency-#{ @dependency_css_digest } .css?body=1" media="screen" rel="stylesheet" />\n <link href="/assets/file1-#{ @file1_css_digest } .css?body=1" media="screen" rel="stylesheet" />\n <link href="/assets/file2-#{ @file2_css_digest } .css?body=1" media="screen" rel="stylesheet" />) ,
408
408
@view . stylesheet_link_tag ( :file1 , :file2 )
409
409
410
- assert_asset_url "/assets/foo-#{ @foo_css_digest } .css?body=1"
411
- assert_asset_url "/assets/bar-#{ @bar_css_digest } .css?body=1"
412
- assert_asset_url "/assets/dependency-#{ @dependency_css_digest } .css?body=1"
413
- assert_asset_url "/assets/file1-#{ @file1_css_digest } .css?body=1"
414
- assert_asset_url "/assets/file2-#{ @file2_css_digest } .css?body=1"
410
+ assert_servable_asset_url "/assets/foo-#{ @foo_css_digest } .css?body=1"
411
+ assert_servable_asset_url "/assets/bar-#{ @bar_css_digest } .css?body=1"
412
+ assert_servable_asset_url "/assets/dependency-#{ @dependency_css_digest } .css?body=1"
413
+ assert_servable_asset_url "/assets/file1-#{ @file1_css_digest } .css?body=1"
414
+ assert_servable_asset_url "/assets/file2-#{ @file2_css_digest } .css?body=1"
415
415
end
416
416
417
417
def test_javascript_path
418
418
super
419
419
420
420
assert_equal "/assets/foo-#{ @foo_js_digest } .js" , @view . javascript_path ( "foo" )
421
- assert_asset_url "/assets/foo-#{ @foo_js_digest } .js"
421
+ assert_servable_asset_url "/assets/foo-#{ @foo_js_digest } .js"
422
422
end
423
423
424
424
def test_stylesheet_path
425
425
super
426
426
427
427
assert_equal "/assets/foo-#{ @foo_css_digest } .css" , @view . stylesheet_path ( "foo" )
428
- assert_asset_url "/assets/foo-#{ @foo_css_digest } .css"
428
+ assert_servable_asset_url "/assets/foo-#{ @foo_css_digest } .css"
429
429
end
430
430
431
431
def test_asset_digest
0 commit comments