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.
38 lines
1 KiB
Ruby
38 lines
1 KiB
Ruby
require 'rails_helper'
|
|
|
|
describe 'devise/shared/_signin_box' do
|
|
describe 'Crowd form' do
|
|
before do
|
|
stub_devise
|
|
assign(:ldap_servers, [])
|
|
allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings)
|
|
end
|
|
|
|
it 'is shown when Crowd is enabled' do
|
|
enable_crowd
|
|
|
|
render
|
|
|
|
expect(rendered).to have_selector('#crowd form')
|
|
end
|
|
|
|
it 'is not shown when Crowd is disabled' do
|
|
render
|
|
|
|
expect(rendered).not_to have_selector('#crowd')
|
|
end
|
|
end
|
|
|
|
def stub_devise
|
|
allow(view).to receive(:devise_mapping).and_return(Devise.mappings[:user])
|
|
allow(view).to receive(:resource).and_return(spy)
|
|
allow(view).to receive(:resource_name).and_return(:user)
|
|
end
|
|
|
|
def enable_crowd
|
|
allow(view).to receive(:form_based_providers).and_return([:crowd])
|
|
allow(view).to receive(:crowd_enabled?).and_return(true)
|
|
allow(view).to receive(:omniauth_authorize_path).with(:user, :crowd)
|
|
.and_return('/crowd')
|
|
end
|
|
end
|