diff options
Diffstat (limited to 'spec/lib/gitlab/conflict/file_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/conflict/file_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb index b54fe40bb5f..80bd517ec92 100644 --- a/spec/lib/gitlab/conflict/file_spec.rb +++ b/spec/lib/gitlab/conflict/file_spec.rb @@ -262,7 +262,7 @@ RSpec.describe Gitlab::Conflict::File do end it 'includes the blob icon for the file' do - expect(conflict_file.as_json[:blob_icon]).to eq('file-text-o') + expect(conflict_file.as_json[:blob_icon]).to eq('doc-text') end context 'with the full_content option passed' do |