From 9fda629a347cb43d8f5871f101192187fcdeeea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Thu, 5 Oct 2017 20:22:24 -0300 Subject: Encapsulate git operations for conflict resolution into lib --- spec/services/merge_requests/conflicts/resolve_service_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/services/merge_requests/conflicts/resolve_service_spec.rb') 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 -- cgit v1.2.1