Fixed repository_controller_spec
also added an #open_branches private method
This commit is contained in:
parent
43958926c5
commit
bd9887e617
|
@ -5,7 +5,7 @@ module Projects
|
|||
|
||||
def show
|
||||
@deploy_keys = DeployKeysPresenter
|
||||
.new(@project, current_user: @current_user)
|
||||
.new(@project, current_user: current_user)
|
||||
|
||||
define_protected_branches
|
||||
end
|
||||
|
@ -37,10 +37,13 @@ module Projects
|
|||
}
|
||||
end
|
||||
|
||||
def open_branches
|
||||
branches = @project.open_branches.map { |br| { text: br.name, id: br.name, title: br.name } }
|
||||
{ open_branches: branches }
|
||||
end
|
||||
|
||||
def load_gon_index
|
||||
open_branches = @project.open_branches.map { |br| { text: br.name, id: br.name, title: br.name } }
|
||||
params = { open_branches: open_branches }
|
||||
gon.push(params.merge(access_levels_options))
|
||||
gon.push(open_branches.merge(access_levels_options))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Projects::Settings::RepositoryController do
|
||||
let(:project) { create(:empty_project, :public) }
|
||||
let(:project) { create(:project_empty_repo, :public) }
|
||||
let(:user) { create(:user) }
|
||||
|
||||
before do
|
||||
|
|
Loading…
Reference in New Issue