From 2b1153f71a680b0c5a4fb787897c20068a405fbf Mon Sep 17 00:00:00 2001 From: blackst0ne Date: Sat, 16 Jun 2018 15:26:15 +1100 Subject: [Rails5] Fix pipeline_schedules_controller_spec In Rails 5.0 there's a bug [1] in controller tests that doesn't parse nested parameters correctly. This commit brings a workaround to make specs work again both in rails4 and rails5. [1]: https://github.com/rails/rails/issues/23997 --- .../projects/pipeline_schedules_controller_spec.rb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'spec') diff --git a/spec/controllers/projects/pipeline_schedules_controller_spec.rb b/spec/controllers/projects/pipeline_schedules_controller_spec.rb index 3506305f755..4cdaa54e0bc 100644 --- a/spec/controllers/projects/pipeline_schedules_controller_spec.rb +++ b/spec/controllers/projects/pipeline_schedules_controller_spec.rb @@ -310,9 +310,19 @@ describe Projects::PipelineSchedulesController do end def go - put :update, namespace_id: project.namespace.to_param, - project_id: project, id: pipeline_schedule, - schedule: schedule + 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, + project_id: project, + id: pipeline_schedule, + schedule: schedule + end end end -- cgit v1.2.1