diff --git a/app/controllers/asset_manager_redirect_controller.rb b/app/controllers/asset_manager_redirect_controller.rb index 7bba68370..fc877b585 100644 --- a/app/controllers/asset_manager_redirect_controller.rb +++ b/app/controllers/asset_manager_redirect_controller.rb @@ -1,6 +1,6 @@ class AssetManagerRedirectController < ApplicationController def show - asset_url = Plek.new.public_asset_host + asset_url = Plek.new.asset_root if request.host.start_with?("draft-") asset_url = Plek.new.external_url_for("draft-assets") end diff --git a/test/controllers/asset_manager_redirect_controller_test.rb b/test/controllers/asset_manager_redirect_controller_test.rb index b32bc2867..a013a984a 100644 --- a/test/controllers/asset_manager_redirect_controller_test.rb +++ b/test/controllers/asset_manager_redirect_controller_test.rb @@ -2,7 +2,7 @@ class AssetManagerRedirectControllerTest < ActionController::TestCase setup do - Plek.any_instance.stubs(:public_asset_host).returns("http://asset-host.com") + Plek.any_instance.stubs(:asset_root).returns("http://asset-host.com") Plek.any_instance.stubs(:external_url_for).returns("http://draft-asset-host.com") end