diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-16 02:28:29 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-24 18:55:01 +0300 |
| commit | faa2e2df8fb95655ebfb8523689295e223005d9d (patch) | |
| tree | b31b33532ddbc7d4966b33e446a27d8c99632261 /spec/services/merge_requests | |
| parent | 0625af3bcb75b3186a3286eee662a7ff8442f130 (diff) | |
Rename commit_file, commit_dir and remove_file and update specs
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/resolve_service_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/services/merge_requests/resolve_service_spec.rb b/spec/services/merge_requests/resolve_service_spec.rb index c3b468ac47f..d33535d22af 100644 --- a/spec/services/merge_requests/resolve_service_spec.rb +++ b/spec/services/merge_requests/resolve_service_spec.rb @@ -66,13 +66,12 @@ describe MergeRequests::ResolveService do context 'when the source project is a fork and does not contain the HEAD of the target branch' do let!(:target_head) do - project.repository.commit_file( + project.repository.create_file( user, 'new-file-in-target', '', message: 'Add new file in target', - branch_name: 'conflict-start', - update: false) + branch_name: 'conflict-start') end before do |