diff options
Diffstat (limited to 'spec/lib/gitlab/conflict/file_collection_spec.rb')
-rw-r--r-- | spec/lib/gitlab/conflict/file_collection_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/conflict/file_collection_spec.rb b/spec/lib/gitlab/conflict/file_collection_spec.rb index f3cdb1a9e59..6da7f8d530d 100644 --- a/spec/lib/gitlab/conflict/file_collection_spec.rb +++ b/spec/lib/gitlab/conflict/file_collection_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Conflict::FileCollection do +RSpec.describe Gitlab::Conflict::FileCollection do let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start') } let(:file_collection) { described_class.new(merge_request) } |