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.1 KiB
Ruby
38 lines
1.1 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'projects/tree/show' do
|
|
include Devise::Test::ControllerHelpers
|
|
|
|
let(:project) { create(:project, :repository) }
|
|
let(:repository) { project.repository }
|
|
|
|
before do
|
|
assign(:project, project)
|
|
assign(:repository, repository)
|
|
|
|
allow(view).to receive(:can?).and_return(true)
|
|
allow(view).to receive(:can_collaborate_with_project?).and_return(true)
|
|
allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings)
|
|
end
|
|
|
|
context 'for branch names ending on .json' do
|
|
let(:ref) { 'ends-with.json' }
|
|
let(:commit) { repository.commit(ref) }
|
|
let(:path) { '' }
|
|
let(:tree) { repository.tree(commit.id, path) }
|
|
|
|
before do
|
|
assign(:id, File.join(ref, path))
|
|
assign(:ref, ref)
|
|
assign(:path, path)
|
|
assign(:last_commit, commit)
|
|
assign(:tree, tree)
|
|
end
|
|
|
|
it 'displays correctly' do
|
|
render
|
|
expect(rendered).to have_css('.js-project-refs-dropdown .dropdown-toggle-text', text: ref)
|
|
expect(rendered).to have_css('.readme-holder')
|
|
end
|
|
end
|
|
end
|