Commit 3940ac85 authored by Valery Sizov's avatar Valery Sizov

Pulling merge_method spec for project_controller_spec from EE[ci skip]

parent 172bae0c
...@@ -289,6 +289,24 @@ describe ProjectsController do ...@@ -289,6 +289,24 @@ describe ProjectsController do
end end
end end
it 'updates Fast Forward Merge attributes' do
controller.instance_variable_set(:@project, project)
params = {
merge_method: :ff
}
put :update,
namespace_id: project.namespace,
id: project.id,
project: params
expect(response).to have_http_status(302)
params.each do |param, value|
expect(project.public_send(param)).to eq(value)
end
end
def update_project(**parameters) def update_project(**parameters)
put :update, put :update,
namespace_id: project.namespace.path, namespace_id: project.namespace.path,
......
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