Skip to content

Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false}) received: 0 times

Jasper Maes requested to merge jlemaes/gitlab-ce:rails5-fix-48104 into master

What does this MR do?

Fix spec/controllers/projects/merge_requests_controller_spec.rb:350 for Rails 5. Rails 5 performed the test with "squash"=>"false" as param instead of "squash"=>false. Fix(as: :json) found here: https://github.com/rails/rails/issues/26075#issuecomment-374826541.

Are there points in the code the reviewer needs to double check?

The spec was failing with a different error on CI as locally. I didn't see the spec anymore in the failures for the pipeline, so I guess its fixed.

Why was this MR needed?

rails5 upgrade

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes #48104 (closed)

Edited by Rémy Coutable

Merge request reports