root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix spec description and outdated comments

This commit is contained in:
Mark Chao 2019-03-06 15:51:22 +08:00
parent 90527b9f84
commit 2609c2a73e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects/blob_controller.rb
View File

@ -108,8 +108,6 @@ class Projects::BlobController < Projects::ApplicationController
# Converts a String array to Gitlab::Diff::Line array # Converts a String array to Gitlab::Diff::Line array
def render_diff_lines def render_diff_lines
@lines.map! do |line| @lines.map! do |line|
# These are marked as context lines but are loaded from blobs.
# We also have context lines loaded from diffs in other places.
diff_line = Gitlab::Diff::Line.new(line, nil, nil, nil, nil) diff_line = Gitlab::Diff::Line.new(line, nil, nil, nil, nil)
diff_line.rich_text = line diff_line.rich_text = line
diff_line diff_line

4
spec/controllers/projects/blob_controller_spec.rb
View File

@ -173,7 +173,7 @@ describe Projects::BlobController do
expect(match_line['type']).to be_nil expect(match_line['type']).to be_nil
end end
it 'adds bottom match line when "t"o is less than blob size' do it 'adds bottom match line when "to" is less than blob size' do
do_get(since: 1, to: 5, offset: 10, from_merge_request: true, bottom: true) do_get(since: 1, to: 5, offset: 10, from_merge_request: true, bottom: true)
match_line = JSON.parse(response.body).last match_line = JSON.parse(response.body).last
@ -183,7 +183,7 @@ describe Projects::BlobController do
expect(match_line['meta_data']).to have_key('new_pos') expect(match_line['meta_data']).to have_key('new_pos')
end end
it 'does not add bottom match line when "to" is less than blob size' do it 'does not add bottom match line when "to" is equal to blob size' do
commit_id = project.repository.commit('master').id commit_id = project.repository.commit('master').id
blob = project.repository.blob_at(commit_id, 'CHANGELOG') blob = project.repository.blob_at(commit_id, 'CHANGELOG')
do_get(since: 1, to: blob.lines.count, offset: 10, from_merge_request: true, bottom: true) do_get(since: 1, to: blob.lines.count, offset: 10, from_merge_request: true, bottom: true)