Skip to content
Snippets Groups Projects
Commit 2609c2a7 authored by Mark Chao's avatar Mark Chao
Browse files

Fix spec description and outdated comments

parent 90527b9f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -108,8 +108,6 @@ class Projects::BlobController < Projects::ApplicationController
# Converts a String array to Gitlab::Diff::Line array
def render_diff_lines
@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.rich_text = line
diff_line
Loading
Loading
Loading
Loading
@@ -173,7 +173,7 @@ describe Projects::BlobController do
expect(match_line['type']).to be_nil
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)
 
match_line = JSON.parse(response.body).last
Loading
Loading
@@ -183,7 +183,7 @@ describe Projects::BlobController do
expect(match_line['meta_data']).to have_key('new_pos')
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
blob = project.repository.blob_at(commit_id, 'CHANGELOG')
do_get(since: 1, to: blob.lines.count, offset: 10, from_merge_request: true, bottom: true)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment