diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-07 11:56:46 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-07 11:56:46 +0000 |
| commit | a82a595728d54bdc12e51dfcfb22e9eddc449143 (patch) | |
| tree | a21ee6f5abef214db8a134ea90736a0518593167 /spec/controllers | |
| parent | e7df959b8f99875edd246c7ac7779c3203e8755e (diff) | |
| parent | 9b53ba2a1577ae002af88f9443d09c9b6b20871c (diff) | |
| download | gitlab-ce-a82a595728d54bdc12e51dfcfb22e9eddc449143.tar.gz | |
Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'
Comment on any expanded diff line on MRs
See merge request gitlab-org/gitlab-ce!22398
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/blob_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb index 64b589a6d83..f58aa25cbdd 100644 --- a/spec/controllers/projects/blob_controller_spec.rb +++ b/spec/controllers/projects/blob_controller_spec.rb @@ -157,7 +157,7 @@ describe Projects::BlobController do match_line = JSON.parse(response.body).first - expect(match_line['type']).to eq('context') + expect(match_line['type']).to be_nil end it 'adds bottom match line when "t"o is less than blob size' do @@ -177,7 +177,7 @@ describe Projects::BlobController do match_line = JSON.parse(response.body).last - expect(match_line['type']).to eq('context') + expect(match_line['type']).to be_nil end end end |