diff options
Diffstat (limited to 'spec/lib/gitlab/conflict/file_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/conflict/file_spec.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb index 1bd077ddbdf..a955ce54e85 100644 --- a/spec/lib/gitlab/conflict/file_spec.rb +++ b/spec/lib/gitlab/conflict/file_spec.rb @@ -267,11 +267,6 @@ FILE it 'includes the full content of the conflict' do expect(conflict_file.as_json(full_content: true)).to have_key(:content) end - - it 'includes the detected language of the conflict file' do - expect(conflict_file.as_json(full_content: true)[:blob_ace_mode]) - .to eq('ruby') - end end end end |