From 2609c2a73e8f8efc4fdd5e13c5378ffae7e4f9ef Mon Sep 17 00:00:00 2001 From: Mark Chao Date: Wed, 6 Mar 2019 15:51:22 +0800 Subject: [PATCH] Fix spec description and outdated comments --- app/controllers/projects/blob_controller.rb | 2 -- spec/controllers/projects/blob_controller_spec.rb | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 63e04539b40..99fda0bf137 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -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 diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb index 250c4aad87f..27093141ed9 100644 --- a/spec/controllers/projects/blob_controller_spec.rb +++ b/spec/controllers/projects/blob_controller_spec.rb @@ -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 @@ -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)