Merge pull request rails#14 from route/fix_sprockets_helper_test

Fix failed test in helper, remove deprecation warning
ndbroadbent · Sep 1, 2012 · 9dfc18b · 9dfc18b
2 parents 457c3e8 + 875af43
commit 9dfc18b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/sprockets_helper_test.rb b/test/sprockets_helper_test.rb
@@ -124,11 +124,11 @@ def compute_host(source, request, options = {})
     @config.asset_host = Proc.new do |asset, request|
       fail "This should not have been called."
     end
-    assert_raises ActionController::RoutingError do
+    assert_raises ActionView::MissingRequestError do
       asset_path("logo.png")
     end
     @config.asset_host = method :compute_host
-    assert_raises ActionController::RoutingError do
+    assert_raises ActionView::MissingRequestError do
       asset_path("logo.png")
     end
   end

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -6,7 +6,7 @@
 require 'action_controller'
 require 'mocha'
 require 'active_support/dependencies'
-require 'action_controller/vendor/html-scanner'
+require 'action_view/vendor/html-scanner'
 
 FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
 FIXTURES = Pathname.new(FIXTURE_LOAD_PATH)