Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into 'master'
[Rails5] Fix pipeline_schedules_controller_spec Closes #48011 See merge request gitlab-org/gitlab-ce!19919
This commit is contained in:
commit
52f53c2e0b
2 changed files with 18 additions and 3 deletions
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: "[Rails5] Fix pipeline_schedules_controller_spec"
|
||||||
|
merge_request: 19919
|
||||||
|
author: "@blackst0ne"
|
||||||
|
type: fixed
|
|
@ -310,11 +310,21 @@ describe Projects::PipelineSchedulesController do
|
||||||
end
|
end
|
||||||
|
|
||||||
def go
|
def go
|
||||||
|
if Gitlab.rails5?
|
||||||
|
put :update, params: { namespace_id: project.namespace.to_param,
|
||||||
|
project_id: project,
|
||||||
|
id: pipeline_schedule,
|
||||||
|
schedule: schedule },
|
||||||
|
as: :html
|
||||||
|
|
||||||
|
else
|
||||||
put :update, namespace_id: project.namespace.to_param,
|
put :update, namespace_id: project.namespace.to_param,
|
||||||
project_id: project, id: pipeline_schedule,
|
project_id: project,
|
||||||
|
id: pipeline_schedule,
|
||||||
schedule: schedule
|
schedule: schedule
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'GET #edit' do
|
describe 'GET #edit' do
|
||||||
describe 'functionality' do
|
describe 'functionality' do
|
||||||
|
|
Loading…
Reference in a new issue