5883ce95ef
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
34 lines
1.2 KiB
Ruby
34 lines
1.2 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe VersionCheckHelper do
|
|
describe '#version_status_badge' do
|
|
it 'should return nil if not dev environment and not enabled' do
|
|
allow(Rails.env).to receive(:production?) { false }
|
|
allow(helper.current_application_settings).to receive(:version_check_enabled) { false }
|
|
|
|
expect(helper.version_status_badge).to be(nil)
|
|
end
|
|
|
|
context 'when production and enabled' do
|
|
before do
|
|
allow(Rails.env).to receive(:production?) { true }
|
|
allow(helper.current_application_settings).to receive(:version_check_enabled) { true }
|
|
allow_any_instance_of(VersionCheck).to receive(:url) { 'https://version.host.com/check.svg?gitlab_info=xxx' }
|
|
|
|
@image_tag = helper.version_status_badge
|
|
end
|
|
|
|
it 'should return an image tag' do
|
|
expect(@image_tag).to match(/^<img/)
|
|
end
|
|
|
|
it 'should have a js prefixed css class' do
|
|
expect(@image_tag).to match(/class="js-version-status-badge lazy"/)
|
|
end
|
|
|
|
it 'should have a VersionCheck url as the src' do
|
|
expect(@image_tag).to match(/src="https:\/\/version\.host\.com\/check\.svg\?gitlab_info=xxx"/)
|
|
end
|
|
end
|
|
end
|
|
end
|