Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2018-06-29 12:21:51 +0300
committerDouwe Maan <douwe@selenight.nl>2018-06-29 12:22:51 +0300
commitf83f1db4bde285ff8539e798a5b15383b06caff6 (patch)
tree556db4f6fa055f00d9038c50f77e39ec62d82a21 /spec/lib/gitlab/favicon_spec.rb
parentee2a9e0af0c91e4cc0d1c24acf35ff1eba1cc8db (diff)
Read asset host from ActionController::Base instead of application config
Diffstat (limited to 'spec/lib/gitlab/favicon_spec.rb')
-rw-r--r--spec/lib/gitlab/favicon_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb
index 122dcd9634c..68abcb3520a 100644
--- a/spec/lib/gitlab/favicon_spec.rb
+++ b/spec/lib/gitlab/favicon_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Gitlab::Favicon, :request_store do
end
it 'returns a full url when the asset host is configured' do
- allow(Gitlab::Application.config).to receive(:asset_host).and_return('http://assets.local')
+ allow(ActionController::Base).to receive(:asset_host).and_return('http://assets.local')
expect(described_class.main).to match %r{^http://localhost/assets/favicon-(?:\h+).png$}
end
end