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.
26 lines
762 B
Ruby
26 lines
762 B
Ruby
require 'spec_helper'
|
|
|
|
describe 'projects/commits/_commit.html.haml' do
|
|
before do
|
|
allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings)
|
|
end
|
|
|
|
context 'with a singed commit' do
|
|
let(:project) { create(:project, :repository) }
|
|
let(:repository) { project.repository }
|
|
let(:ref) { GpgHelpers::SIGNED_COMMIT_SHA }
|
|
let(:commit) { repository.commit(ref) }
|
|
|
|
it 'does not display a loading spinner for GPG status' do
|
|
render partial: 'projects/commits/commit', locals: {
|
|
project: project,
|
|
ref: ref,
|
|
commit: commit
|
|
}
|
|
|
|
within '.gpg-status-box' do
|
|
expect(page).not_to have_css('i.fa.fa-spinner.fa-spin')
|
|
end
|
|
end
|
|
end
|
|
end
|