REMOVE THIS COMMIT: allow undoing last resolution

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index bca5d8c0655..226650399cc 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -638,6 +638,19 @@ describe Projects::MergeRequestsController do
       it 'redirects to the MR show page' do
         expect(response).to redirect_to([merge_request_with_conflicts.target_project.namespace.becomes(Namespace), merge_request_with_conflicts.target_project, merge_request_with_conflicts])
       end
+
+      context 'undoing the resolution' do
+        before do
+          post :undo_last_resolution,
+               namespace_id: merge_request_with_conflicts.project.namespace.to_param,
+               project_id: merge_request_with_conflicts.project.to_param,
+               id: merge_request_with_conflicts.iid
+        end
+
+        it 'undoes the commit' do
+          expect(original_head_sha).to eq(merge_request_with_conflicts.source_branch_head.sha)
+        end
+      end
     end
 
     context 'when sections are missing' do