summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/blob_controller_spec.rb
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2018-11-07 19:57:26 -0200
committerOswaldo Ferreira <oswaldo@gitlab.com>2018-11-07 19:57:26 -0200
commit198402b38b59a43aa6e50259d7c13c0097dbdfac (patch)
tree972469d726a9fc38fa990ed6a5b29d9e91b409f6 /spec/controllers/projects/blob_controller_spec.rb
parent8467167bbc7fb16e25b202c6eda37a9fe1f1a9d7 (diff)
downloadgitlab-ce-198402b38b59a43aa6e50259d7c13c0097dbdfac.tar.gz
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-line
This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
Diffstat (limited to 'spec/controllers/projects/blob_controller_spec.rb')
-rw-r--r--spec/controllers/projects/blob_controller_spec.rb4
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 5fdf7f1229d..28f7e4634a5 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 be_nil
+ expect(match_line['type']).to eq('context')
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 be_nil
+ expect(match_line['type']).to eq('context')
end
end
end