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
This commit is contained in:
commit
1c28b624d6
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue