diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-11 18:55:29 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-11 18:55:29 +0300 |
commit | 1c28b624d670e7c764f14e30d409a1b1ab1a8c9d (patch) | |
tree | f76a20e0d3f67c334a9c680fb0c0a59e42da4007 | |
parent | 75797ac3d2b534a1deda48c8450027055a7c721b (diff) | |
parent | 7fcfe7ccab12e69d7f1d0130614c3dfa374f05d3 (diff) |
Merge branch 'jprovazn-rails5-boards' into 'master'
[Rails5] Fix conversion of integer into string in board spec
Closes #47653
See merge request gitlab-org/gitlab-ce!19616
-rw-r--r-- | spec/controllers/boards/lists_controller_spec.rb | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/spec/controllers/boards/lists_controller_spec.rb b/spec/controllers/boards/lists_controller_spec.rb index 71d45a22d91..57ccbf1d6b5 100644 --- a/spec/controllers/boards/lists_controller_spec.rb +++ b/spec/controllers/boards/lists_controller_spec.rb @@ -156,12 +156,18 @@ describe Boards::ListsController do def move(user:, board:, list:, position:) sign_in(user) - patch :update, namespace_id: project.namespace.to_param, - project_id: project, - board_id: board.to_param, - id: list.to_param, - list: { position: position }, - format: :json + params = { namespace_id: project.namespace.to_param, + project_id: project, + board_id: board.to_param, + id: list.to_param, + list: { position: position }, + format: :json } + + if Gitlab.rails5? + patch :update, params: params, as: :json + else + patch :update, params + end end end |