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.
21 lines
627 B
Ruby
21 lines
627 B
Ruby
require 'spec_helper'
|
|
|
|
describe 'admin/dashboard/index.html.haml' do
|
|
include Devise::Test::ControllerHelpers
|
|
|
|
before do
|
|
assign(:projects, create_list(:project, 1))
|
|
assign(:users, create_list(:user, 1))
|
|
assign(:groups, create_list(:group, 1))
|
|
|
|
allow(view).to receive(:admin?).and_return(true)
|
|
allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings)
|
|
end
|
|
|
|
it "shows version of GitLab Workhorse" do
|
|
render
|
|
|
|
expect(rendered).to have_content 'GitLab Workhorse'
|
|
expect(rendered).to have_content Gitlab::Workhorse.version
|
|
end
|
|
end
|