summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2016-11-18 11:14:44 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2016-11-21 13:26:26 +0100
commit9e9965ba5ce5a2acca97325412c63eed398ef80b (patch)
tree365949ae69b51937ba3b6c06fb3fecfcaeb3923a /spec
parent5018bdcd0ab45df924956125f9d11f66847f8164 (diff)
downloadgitlab-ce-9e9965ba5ce5a2acca97325412c63eed398ef80b.tar.gz
Revert "Do not create a MergeRequestDiff record when source branch is deleted"
This reverts commit f913170e2f76ef44800f0272cb7fb40b9d6709ee.
Diffstat (limited to 'spec')
-rw-r--r--spec/services/merge_requests/refresh_service_spec.rb10
1 files changed, 0 insertions, 10 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 0220f7e1db2..e515bc9f89c 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -227,16 +227,6 @@ describe MergeRequests::RefreshService, services: true do
end
end
- context 'when the source branch is deleted' do
- it 'does not create a MergeRequestDiff record' do
- refresh_service = service.new(@project, @user)
-
- expect do
- refresh_service.execute(@oldrev, Gitlab::Git::BLANK_SHA, 'refs/heads/master')
- end.not_to change { MergeRequestDiff.count }
- end
- end
-
def reload_mrs
@merge_request.reload
@fork_merge_request.reload