Commit 1c28b624 authored by Rémy Coutable's avatar Rémy Coutable

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
parents 75797ac3 7fcfe7cc
...@@ -156,12 +156,18 @@ describe Boards::ListsController do ...@@ -156,12 +156,18 @@ describe Boards::ListsController do
def move(user:, board:, list:, position:) def move(user:, board:, list:, position:)
sign_in(user) sign_in(user)
patch :update, namespace_id: project.namespace.to_param, params = { namespace_id: project.namespace.to_param,
project_id: project, project_id: project,
board_id: board.to_param, board_id: board.to_param,
id: list.to_param, id: list.to_param,
list: { position: position }, list: { position: position },
format: :json format: :json }
if Gitlab.rails5?
patch :update, params: params, as: :json
else
patch :update, params
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment