diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-06 02:22:24 +0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-13 03:45:15 +0300 |
| commit | 9fda629a347cb43d8f5871f101192187fcdeeea2 (patch) | |
| tree | 05e0129a812061d049da8ce72450e9c9997738f7 /spec/services/merge_requests/conflicts | |
| parent | e49e443b70fc819bf19866523f08ef0707e1b5a4 (diff) | |
Encapsulate git operations for conflict resolution into lib
Diffstat (limited to 'spec/services/merge_requests/conflicts')
| -rw-r--r-- | spec/services/merge_requests/conflicts/resolve_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/conflicts/resolve_service_spec.rb b/spec/services/merge_requests/conflicts/resolve_service_spec.rb index a1f7dc44d31..9dc6e3c3494 100644 --- a/spec/services/merge_requests/conflicts/resolve_service_spec.rb +++ b/spec/services/merge_requests/conflicts/resolve_service_spec.rb @@ -248,7 +248,7 @@ describe MergeRequests::Conflicts::ResolveService do it 'raises a MissingFiles error' do expect { service.execute(user, invalid_params) } - .to raise_error(described_class::MissingFiles) + .to raise_error(Gitlab::Conflict::FileCollection::MissingFiles) end end end |