Commit b7d17aab authored by Shinya Maeda's avatar Shinya Maeda

Use new project_variables_path in this MR

parent 8c434a52
...@@ -5,7 +5,7 @@ class Projects::VariablesController < Projects::ApplicationController ...@@ -5,7 +5,7 @@ class Projects::VariablesController < Projects::ApplicationController
layout 'project_settings' layout 'project_settings'
def index def index
redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project) redirect_to project_settings_ci_cd_path(@project)
end end
def show def show
...@@ -34,11 +34,11 @@ class Projects::VariablesController < Projects::ApplicationController ...@@ -34,11 +34,11 @@ class Projects::VariablesController < Projects::ApplicationController
def destroy def destroy
if variable.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, status: 302,
notice: 'Variable was successfully removed.' notice: 'Variable was successfully removed.'
else else
redirect_to namespace_project_settings_ci_cd_path(project.namespace, project), redirect_to project_settings_ci_cd_path(project),
status: 302, status: 302,
notice: 'Failed to remove the variable.' notice: 'Failed to remove the variable.'
end end
......
...@@ -8,9 +8,9 @@ module Ci ...@@ -8,9 +8,9 @@ module Ci
def form_path def form_path
if variable.persisted? if variable.persisted?
namespace_project_variable_path(project.namespace, project, variable) project_variable_path(project, variable)
else else
namespace_project_variables_path(project.namespace, project) project_variables_path(project)
end end
end end
......
...@@ -38,26 +38,26 @@ describe Ci::VariablePresenter do ...@@ -38,26 +38,26 @@ describe Ci::VariablePresenter do
context 'when variable is persisted' 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(namespace_project_variable_path(project.namespace, project, variable)) } it { is_expected.to eq(project_variable_path(project, variable)) }
end end
context 'when variable is not persisted' do context 'when variable is not persisted' do
let(:variable) { build(:ci_variable, project: project) } let(:variable) { build(:ci_variable, project: project) }
subject { described_class.new(variable).form_path } 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
end end
describe '#edit_path' do describe '#edit_path' do
subject { described_class.new(variable).edit_path } 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 end
describe '#delete_path' do describe '#delete_path' do
subject { described_class.new(variable).delete_path } 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
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment