Skip to content

Commit bef47fc

Browse files
rafaelfrancaRafael Mendonça França
authored and
Rafael Mendonça França
committed
Merge pull request #145 from dskang/fix-absolute-test
Fix failing absolute asset path test
1 parent 71fe1a7 commit bef47fc

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

test/test_helper.rb

+16-16
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,22 @@ def test_stylesheet_path
372372
assert_equal "/assets/foo-#{@foo_css_digest}.css", @view.stylesheet_path("foo")
373373
end
374374

375+
def test_absolute_asset_path_error
376+
Sprockets::Rails::Helper.raise_runtime_errors = true
377+
@view.assets_environment = @assets
378+
379+
assert_equal "/assets/foo-#{@foo_js_digest}.js", @view.asset_path("foo.js")
380+
assert_raises(Sprockets::Rails::Helper::AbsoluteAssetPathError) do
381+
@view.asset_path("/assets/foo.js")
382+
end
383+
384+
assert_equal "/unknown.js", @view.asset_path("unknown.js")
385+
assert_equal "/assets/unknown.js", @view.asset_path("/assets/unknown.js")
386+
387+
Sprockets::Rails::Helper.raise_runtime_errors = false
388+
assert_equal "/assets/foo.js", @view.asset_path("/assets/foo.js")
389+
end
390+
375391
def test_asset_digest_path
376392
assert_equal "foo-#{@foo_js_digest}.js", @view.asset_digest_path("foo.js")
377393
assert_equal "foo-#{@foo_css_digest}.css", @view.asset_digest_path("foo.css")
@@ -397,22 +413,6 @@ def test_public_folder_fallback_works_correctly
397413
@view.javascript_include_tag("asset-does-not-exist-foo.js")
398414
end
399415

400-
def test_absolute_asset_path_error
401-
Sprockets::Rails::Helper.raise_runtime_errors = true
402-
@view.assets_environment = @assets
403-
404-
assert_equal "/assets/foo-#{@foo_js_digest}.js", @view.asset_path("foo.js")
405-
assert_raises(Sprockets::Rails::Helper::AbsoluteAssetPathError) do
406-
@view.asset_path("/assets/foo.js")
407-
end
408-
409-
assert_equal "/unknown.js", @view.asset_path("unknown.js")
410-
assert_equal "/assets/unknown.js", @view.asset_path("/assets/unknown.js")
411-
412-
Sprockets::Rails::Helper.raise_runtime_errors = false
413-
assert_equal "/assets/foo.js", @view.asset_path("/assets/foo.js")
414-
end
415-
416416
def test_asset_not_precompiled_error
417417
Sprockets::Rails::Helper.precompile = [ lambda {|logical_path| false } ]
418418

0 commit comments

Comments
 (0)