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

1 files changed, 13 insertions, 3 deletions

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