Commit 5a53b5bb authored by Eric Eastwood's avatar Eric Eastwood

Better reflect what fast-forward test is trying to test

parent eb7eba23
...@@ -202,14 +202,13 @@ describe 'Merge request', :js do ...@@ -202,14 +202,13 @@ describe 'Merge request', :js do
end end
end end
context 'view merge request with MWPS enabled but fast-forward merge is not possible' do context 'view merge request where fast-forward merge is not possible' do
before do before do
project.update(merge_requests_ff_only_enabled: true) project.update(merge_requests_ff_only_enabled: true)
merge_request.update( merge_request.update(
merge_when_pipeline_succeeds: true,
merge_user: merge_request.author, merge_user: merge_request.author,
state: :can_be_merged merge_status: :cannot_be_merged
) )
visit project_merge_request_path(project, merge_request) visit project_merge_request_path(project, merge_request)
......
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