diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-18 09:18:32 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-18 09:18:32 +0000 |
| commit | 52f53c2e0b814cccd97c4c25e07ba6de7cd7fbc3 (patch) | |
| tree | 85cb1d621e521064df6e692671779ad86f389a7f | |
| parent | 2a82179e102159b8416f4a20d3349ef208c58738 (diff) | |
| parent | 2b1153f71a680b0c5a4fb787897c20068a405fbf (diff) | |
| download | gitlab-ce-52f53c2e0b814cccd97c4c25e07ba6de7cd7fbc3.tar.gz | |
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
| -rw-r--r-- | changelogs/unreleased/blackst0ne-rails5-fix-pipeline-schedules-controller-spec.yml | 5 | ||||
| -rw-r--r-- | spec/controllers/projects/pipeline_schedules_controller_spec.rb | 16 |
2 files changed, 18 insertions, 3 deletions
diff --git a/changelogs/unreleased/blackst0ne-rails5-fix-pipeline-schedules-controller-spec.yml b/changelogs/unreleased/blackst0ne-rails5-fix-pipeline-schedules-controller-spec.yml new file mode 100644 index 00000000000..7a2b19ad681 --- /dev/null +++ b/changelogs/unreleased/blackst0ne-rails5-fix-pipeline-schedules-controller-spec.yml @@ -0,0 +1,5 @@ +--- +title: "[Rails5] Fix pipeline_schedules_controller_spec" +merge_request: 19919 +author: "@blackst0ne" +type: fixed 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 |