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

Use new project_variables_path in this MR

This commit is contained in:
Shinya Maeda 2017-07-06 20:18:11 +09:00
parent 8c434a52fc
commit b7d17aab66
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/projects/variables_controller.rb
View File

@ -5,7 +5,7 @@ class Projects::VariablesController < Projects::ApplicationController
layout 'project_settings'
def index
redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project)
redirect_to project_settings_ci_cd_path(@project)
end
def show
@ -34,11 +34,11 @@ class Projects::VariablesController < Projects::ApplicationController
def destroy
if variable.destroy
redirect_to namespace_project_settings_ci_cd_path(project.namespace, project),
redirect_to project_settings_ci_cd_path(project),
status: 302,
notice: 'Variable was successfully removed.'
else
redirect_to namespace_project_settings_ci_cd_path(project.namespace, project),
redirect_to project_settings_ci_cd_path(project),
status: 302,
notice: 'Failed to remove the variable.'
end

4
app/presenters/ci/variable_presenter.rb
View File

@ -8,9 +8,9 @@ module Ci
def form_path
if variable.persisted?
namespace_project_variable_path(project.namespace, project, variable)
project_variable_path(project, variable)
else
namespace_project_variables_path(project.namespace, project)
project_variables_path(project)
end
end

8
spec/presenters/ci/variable_presenter_spec.rb
View File

@ -38,26 +38,26 @@ describe Ci::VariablePresenter do
context 'when variable is persisted' do
subject { described_class.new(variable).form_path }
it { is_expected.to eq(namespace_project_variable_path(project.namespace, project, variable)) }
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(namespace_project_variables_path(project.namespace, project)) }
it { is_expected.to eq(project_variables_path(project)) }
end
end
describe '#edit_path' do
subject { described_class.new(variable).edit_path }
it { is_expected.to eq(namespace_project_variable_path(project.namespace, project, variable)) }
it { is_expected.to eq(project_variable_path(project, variable)) }
end
describe '#delete_path' do
subject { described_class.new(variable).delete_path }
it { is_expected.to eq(namespace_project_variable_path(project.namespace, project, variable)) }
it { is_expected.to eq(project_variable_path(project, variable)) }
end
end