Commit 8c1e9ecd authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Corrected tests and changed trigger controller redirects to the ci_cd_pipelines_settings controller

parent e4b345ca
...@@ -4,7 +4,7 @@ class Projects::TriggersController < Projects::ApplicationController ...@@ -4,7 +4,7 @@ class Projects::TriggersController < Projects::ApplicationController
layout 'project_settings' layout 'project_settings'
def index def index
redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project) redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
end end
def create def create
...@@ -12,7 +12,7 @@ class Projects::TriggersController < Projects::ApplicationController ...@@ -12,7 +12,7 @@ class Projects::TriggersController < Projects::ApplicationController
@trigger.save @trigger.save
if @trigger.valid? if @trigger.valid?
redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project) redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
else else
@triggers = project.triggers.select(&:persisted?) @triggers = project.triggers.select(&:persisted?)
render :index render :index
...@@ -22,7 +22,7 @@ class Projects::TriggersController < Projects::ApplicationController ...@@ -22,7 +22,7 @@ class Projects::TriggersController < Projects::ApplicationController
def destroy def destroy
trigger.destroy trigger.destroy
redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project) redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
end end
private private
......
...@@ -122,7 +122,6 @@ describe "Runners" do ...@@ -122,7 +122,6 @@ describe "Runners" do
scenario 'user checks default configuration' do scenario 'user checks default configuration' do
visit namespace_project_runner_path(project.namespace, project, runner) visit namespace_project_runner_path(project.namespace, project, runner)
expect(page).to have_content 'Can run untagged jobs Yes' expect(page).to have_content 'Can run untagged jobs Yes'
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