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.
42 lines
1.1 KiB
Ruby
42 lines
1.1 KiB
Ruby
require 'rails_helper'
|
|
|
|
describe 'help/index' do
|
|
describe 'version information' do
|
|
it 'is hidden from guests' do
|
|
stub_user(nil)
|
|
stub_version('8.0.2', 'abcdefg')
|
|
stub_helpers
|
|
|
|
render
|
|
|
|
expect(rendered).not_to match '8.0.2'
|
|
expect(rendered).not_to match 'abcdefg'
|
|
end
|
|
|
|
it 'is shown to users' do
|
|
stub_user
|
|
stub_version('8.0.2', 'abcdefg')
|
|
stub_helpers
|
|
|
|
render
|
|
|
|
expect(rendered).to match '8.0.2'
|
|
expect(rendered).to have_link('abcdefg', 'https://gitlab.com/gitlab-org/gitlab-ce/commits/abcdefg')
|
|
end
|
|
end
|
|
|
|
def stub_user(user = double)
|
|
allow(view).to receive(:user_signed_in?).and_return(user)
|
|
end
|
|
|
|
def stub_version(version, revision)
|
|
stub_const('Gitlab::VERSION', version)
|
|
stub_const('Gitlab::REVISION', revision)
|
|
end
|
|
|
|
def stub_helpers
|
|
allow(view).to receive(:markdown).and_return('')
|
|
allow(view).to receive(:version_status_badge).and_return('')
|
|
allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings)
|
|
end
|
|
end
|