kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Update CI Variable presenters paths

Browse source
This commit is contained in:
Matija Čupić 2018-01-23 21:26:30 +01:00
parent 2592aec9e3
commit 1292c158ce
No known key found for this signature in database
GPG key ID: 4BAF84FFACD2E5DE
4 changed files with 14 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/presenters/ci/group_variable_presenter.rb
View file

@ -7,19 +7,15 @@ module Ci
end
def form_path
if variable.persisted?
group_variable_path(group, variable)
else
group_variables_path(group)
end
group_settings_ci_cd_path(group)
end
def edit_path
group_variable_path(group, variable)
group_variables_save_multiple_path(group)
end
def delete_path
group_variable_path(group, variable)
group_variables_save_multiple_path(group)
end
end
end

10
app/presenters/ci/variable_presenter.rb
View file

@ -7,19 +7,15 @@ module Ci
end
def form_path
if variable.persisted?
project_variable_path(project, variable)
else
project_variables_path(project)
end
project_settings_ci_cd_path(project)
end
def edit_path
project_variable_path(project, variable)
project_variables_save_multiple_path(project)
end
def delete_path
project_variable_path(project, variable)
project_variables_save_multiple_path(project)
end
end
end

17
spec/presenters/ci/group_variable_presenter_spec.rb
View file

@ -35,29 +35,20 @@ describe Ci::GroupVariablePresenter do
end
describe '#form_path' do
context 'when variable is persisted' do
subject { described_class.new(variable).form_path }
subject { described_class.new(variable).form_path }
it { is_expected.to eq(group_variable_path(group, variable)) }
end
context 'when variable is not persisted' do
let(:variable) { build(:ci_group_variable, group: group) }
subject { described_class.new(variable).form_path }
it { is_expected.to eq(group_variables_path(group)) }
end
it { is_expected.to eq(group_settings_ci_cd_path(group)) }
end
describe '#edit_path' do
subject { described_class.new(variable).edit_path }
it { is_expected.to eq(group_variable_path(group, variable)) }
it { is_expected.to eq(group_variables_save_multiple_path(group)) }
end
describe '#delete_path' do
subject { described_class.new(variable).delete_path }
it { is_expected.to eq(group_variable_path(group, variable)) }
it { is_expected.to eq(group_variables_save_multiple_path(group)) }
end
end

17
spec/presenters/ci/variable_presenter_spec.rb
View file

@ -35,29 +35,20 @@ describe Ci::VariablePresenter do
end
describe '#form_path' do
context 'when variable is persisted' do
subject { described_class.new(variable).form_path }
subject { described_class.new(variable).form_path }
it { is_expected.to eq(project_variable_path(project, variable)) }
end
context 'when variable is not persisted' do
let(:variable) { build(:ci_variable, project: project) }
subject { described_class.new(variable).form_path }
it { is_expected.to eq(project_variables_path(project)) }
end
it { is_expected.to eq(project_settings_ci_cd_path(project)) }
end
describe '#edit_path' do
subject { described_class.new(variable).edit_path }
it { is_expected.to eq(project_variable_path(project, variable)) }
it { is_expected.to eq(project_variables_save_multiple_path(project)) }
end
describe '#delete_path' do
subject { described_class.new(variable).delete_path }
it { is_expected.to eq(project_variable_path(project, variable)) }
it { is_expected.to eq(project_variables_save_multiple_path(project)) }
end
end