Skip to content

Commit d359280

Browse files
committed
Merge pull request #151 from dskang/fix-error
Move AbsoluteAssetPathError under tests for runtime errors
2 parents 2ac0480 + 5d7e091 commit d359280

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

test/test_helper.rb

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -373,22 +373,6 @@ def test_stylesheet_path
373373
assert_equal "/assets/foo-#{@foo_css_digest}.css", @view.stylesheet_path("foo")
374374
end
375375

376-
def test_absolute_asset_path_error
377-
Sprockets::Rails::Helper.raise_runtime_errors = true
378-
@view.assets_environment = @assets
379-
380-
assert_equal "/assets/foo-#{@foo_js_digest}.js", @view.asset_path("foo.js")
381-
assert_raises(Sprockets::Rails::Helper::AbsoluteAssetPathError) do
382-
@view.asset_path("/assets/foo.js")
383-
end
384-
385-
assert_equal "/unknown.js", @view.asset_path("unknown.js")
386-
assert_equal "/assets/unknown.js", @view.asset_path("/assets/unknown.js")
387-
388-
Sprockets::Rails::Helper.raise_runtime_errors = false
389-
assert_equal "/assets/foo.js", @view.asset_path("/assets/foo.js")
390-
end
391-
392376
def test_asset_digest_path
393377
assert_equal "foo-#{@foo_js_digest}.js", @view.asset_digest_path("foo.js")
394378
assert_equal "foo-#{@foo_css_digest}.css", @view.asset_digest_path("foo.css")
@@ -400,7 +384,7 @@ def test_asset_digest
400384
end
401385
end
402386

403-
class PrecompileHelperTest < HelperTest
387+
class RuntimeErrorsHelperTest < HelperTest
404388
def setup
405389
super
406390

@@ -441,7 +425,7 @@ def test_asset_not_precompiled_error
441425
@view.javascript_include_tag("foo")
442426
end
443427

444-
error = assert_raises(Sprockets::Rails::Helper::AssetFilteredError) do
428+
assert_raises(Sprockets::Rails::Helper::AssetFilteredError) do
445429
@view.javascript_include_tag(:foo)
446430
end
447431

@@ -513,6 +497,21 @@ def test_non_javascripts_and_stylesheets
513497

514498
@view.asset_path("logo.png")
515499
end
500+
501+
def test_absolute_asset_path_error
502+
Sprockets::Rails::Helper.precompile = [ lambda {|logical_path| true } ]
503+
504+
assert_equal "/assets/foo.js", @view.asset_path("foo.js")
505+
assert_raises(Sprockets::Rails::Helper::AbsoluteAssetPathError) do
506+
@view.asset_path("/assets/foo.js")
507+
end
508+
509+
assert_equal "/unknown.js", @view.asset_path("unknown.js")
510+
assert_equal "/assets/unknown.js", @view.asset_path("/assets/unknown.js")
511+
512+
Sprockets::Rails::Helper.raise_runtime_errors = false
513+
assert_equal "/assets/foo.js", @view.asset_path("/assets/foo.js")
514+
end
516515
end
517516

518517
class AutomaticDependenciesFromHelpersTest < HelperTest

0 commit comments

Comments
 (0)