diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-03 14:10:42 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:47 +0300 |
| commit | 52eb523c9b28a258489202dd35a2a65535d31cab (patch) | |
| tree | 7b8714d44e488aaa5b701d1772281a54c58c6ba2 /spec/lib/gitlab/conflict | |
| parent | e50e88b85c54097db22d571cfc76fcef143e1d01 (diff) | |
Add blob_icon to conflict file JSON
Diffstat (limited to 'spec/lib/gitlab/conflict')
| -rw-r--r-- | spec/lib/gitlab/conflict/file_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb index a57ca70672b..cf670b3182a 100644 --- a/spec/lib/gitlab/conflict/file_spec.rb +++ b/spec/lib/gitlab/conflict/file_spec.rb @@ -148,5 +148,9 @@ describe Gitlab::Conflict::File, lib: true do expect(conflict_file.as_json[:blob_path]). to eq("/#{project.namespace.to_param}/#{merge_request.project.to_param}/blob/#{our_commit.oid}/files/ruby/regex.rb") end + + it 'includes the blob icon for the file' do + expect(conflict_file.as_json[:blob_icon]).to eq('file-text-o') + end end end |