Code tweaks

6 files changed, 43 insertions, 41 deletions

diff --git a/lib/gitlab/diff/position.rb b/lib/gitlab/diff/position.rb
index ccc8095e80a..ab11018ed3a 100644
--- a/lib/gitlab/diff/position.rb
+++ b/lib/gitlab/diff/position.rb
@@ -10,6 +10,8 @@ module Gitlab
                :base_sha,
                :start_sha,
                :head_sha,
+               :old_line,
+               :new_line,
                :position_type, to: :formatter
 
       # A position can belong to a text line or to an image coordinate
diff --git a/lib/gitlab/diff/position_tracer.rb b/lib/gitlab/diff/position_tracer.rb
index 4b7e65e8471..b68a1636814 100644
--- a/lib/gitlab/diff/position_tracer.rb
+++ b/lib/gitlab/diff/position_tracer.rb
@@ -89,7 +89,7 @@ module Gitlab
 
       def trace_added_line(ab_position)
         b_path = ab_position.new_path
-        b_line = ab_position.formatter.new_line
+        b_line = ab_position.new_line
 
         bd_diff = bd_diffs.diff_file_with_old_path(b_path)
 
@@ -128,7 +128,7 @@ module Gitlab
 
       def trace_removed_line(ab_position)
         a_path = ab_position.old_path
-        a_line = ab_position.formatter.old_line
+        a_line = ab_position.old_line
 
         ac_diff = ac_diffs.diff_file_with_old_path(a_path)
 
@@ -159,9 +159,9 @@ module Gitlab
 
       def trace_unchanged_line(ab_position)
         a_path = ab_position.old_path
-        a_line = ab_position.formatter.old_line
+        a_line = ab_position.old_line
         b_path = ab_position.new_path
-        b_line = ab_position.formatter.new_line
+        b_line = ab_position.new_line
 
         ac_diff = ac_diffs.diff_file_with_old_path(a_path)
 
diff --git a/spec/features/merge_requests/image_diff_notes.rb b/spec/features/merge_requests/image_diff_notes.rb
index f0adf86ea62..2c9e9b18be5 100644
--- a/spec/features/merge_requests/image_diff_notes.rb
+++ b/spec/features/merge_requests/image_diff_notes.rb
@@ -17,7 +17,7 @@ feature 'image diff notes', js: true do
     allow_any_instance_of(DiffHelper).to receive(:diff_file_blob_raw_path).and_return('/apple-touch-icon.png')
   end
 
-  context 'create commit diff notes', focus: true do
+  context 'create commit diff notes' do
     commit_id = '2f63565e7aac07bcdadb654e253078b727143ec4'
 
     describe 'create a new diff note' do
@@ -128,7 +128,7 @@ feature 'image diff notes', js: true do
           create_image_diff_note
         end
 
-        it 'shows indicator badge on image diff'do
+        it 'shows indicator badge on image diff' do
           indicator = find('.js-image-badge', match: :first)
 
           expect(indicator).to have_content('1')
diff --git a/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb b/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb
index 44f731d501c..897dc917f6a 100644
--- a/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb
+++ b/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb
@@ -21,7 +21,7 @@ describe Gitlab::Diff::Formatters::TextFormatter do
     let(:attrs) { complete }
   end
 
-  # Especific text formatter examples
+  # Specific text formatter examples
   let!(:formatter) { described_class.new(attrs) }
 
   describe '#line_age' do
diff --git a/spec/lib/gitlab/diff/position_spec.rb b/spec/lib/gitlab/diff/position_spec.rb
index e05c3718adc..66727a9dabe 100644
--- a/spec/lib/gitlab/diff/position_spec.rb
+++ b/spec/lib/gitlab/diff/position_spec.rb
@@ -33,14 +33,14 @@ describe Gitlab::Diff::Position do
         diff_line = subject.diff_line(project.repository)
 
         expect(diff_line.added?).to be true
-        expect(diff_line.new_line).to eq(subject.formatter.new_line)
+        expect(diff_line.new_line).to eq(subject.new_line)
         expect(diff_line.text).to eq("+    <desc>Created with Sketch.</desc>")
       end
     end
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.formatter.new_line, 0)
+        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, 0)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
@@ -101,14 +101,14 @@ describe Gitlab::Diff::Position do
           diff_line = subject.diff_line(project.repository)
 
           expect(diff_line.added?).to be true
-          expect(diff_line.new_line).to eq(subject.formatter.new_line)
+          expect(diff_line.new_line).to eq(subject.new_line)
           expect(diff_line.text).to eq("+    vars = {")
         end
       end
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.formatter.new_line, 15)
+          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, 15)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -141,15 +141,15 @@ describe Gitlab::Diff::Position do
           diff_line = subject.diff_line(project.repository)
 
           expect(diff_line.unchanged?).to be true
-          expect(diff_line.old_line).to eq(subject.formatter.old_line)
-          expect(diff_line.new_line).to eq(subject.formatter.new_line)
+          expect(diff_line.old_line).to eq(subject.old_line)
+          expect(diff_line.new_line).to eq(subject.new_line)
           expect(diff_line.text).to eq("     unless File.directory?(path)")
         end
       end
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.formatter.new_line, subject.formatter.old_line)
+          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -182,14 +182,14 @@ describe Gitlab::Diff::Position do
           diff_line = subject.diff_line(project.repository)
 
           expect(diff_line.removed?).to be true
-          expect(diff_line.old_line).to eq(subject.formatter.old_line)
+          expect(diff_line.old_line).to eq(subject.old_line)
           expect(diff_line.text).to eq("-    options = { chdir: path }")
         end
       end
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 13, subject.formatter.old_line)
+          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 13, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -226,14 +226,14 @@ describe Gitlab::Diff::Position do
           diff_line = subject.diff_line(project.repository)
 
           expect(diff_line.added?).to be true
-          expect(diff_line.new_line).to eq(subject.formatter.new_line)
+          expect(diff_line.new_line).to eq(subject.new_line)
           expect(diff_line.text).to eq("+      new CommitFile(@)")
         end
       end
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.formatter.new_line, 5)
+          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, 5)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -266,15 +266,15 @@ describe Gitlab::Diff::Position do
           diff_line = subject.diff_line(project.repository)
 
           expect(diff_line.unchanged?).to be true
-          expect(diff_line.old_line).to eq(subject.formatter.old_line)
-          expect(diff_line.new_line).to eq(subject.formatter.new_line)
+          expect(diff_line.old_line).to eq(subject.old_line)
+          expect(diff_line.new_line).to eq(subject.new_line)
           expect(diff_line.text).to eq("     $('.files .diff-file').each ->")
         end
       end
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.formatter.new_line, subject.formatter.old_line)
+          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -307,14 +307,14 @@ describe Gitlab::Diff::Position do
           diff_line = subject.diff_line(project.repository)
 
           expect(diff_line.removed?).to be true
-          expect(diff_line.old_line).to eq(subject.formatter.old_line)
+          expect(diff_line.old_line).to eq(subject.old_line)
           expect(diff_line.text).to eq("-      new CommitFile(this)")
         end
       end
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 4, subject.formatter.old_line)
+          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 4, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -350,14 +350,14 @@ describe Gitlab::Diff::Position do
         diff_line = subject.diff_line(project.repository)
 
         expect(diff_line.removed?).to be true
-        expect(diff_line.old_line).to eq(subject.formatter.old_line)
+        expect(diff_line.old_line).to eq(subject.old_line)
         expect(diff_line.text).to eq("-Copyright (c) 2014 gitlabhq")
       end
     end
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 0, subject.formatter.old_line)
+        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 0, subject.old_line)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
@@ -392,14 +392,14 @@ describe Gitlab::Diff::Position do
         diff_line = subject.diff_line(project.repository)
 
         expect(diff_line.added?).to be true
-        expect(diff_line.new_line).to eq(subject.formatter.new_line)
+        expect(diff_line.new_line).to eq(subject.new_line)
         expect(diff_line.text).to eq("+testme")
       end
     end
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.formatter.new_line, 0)
+        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, 0)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
@@ -440,14 +440,14 @@ describe Gitlab::Diff::Position do
         diff_line = subject.diff_line(project.repository)
 
         expect(diff_line.removed?).to be true
-        expect(diff_line.old_line).to eq(subject.formatter.old_line)
+        expect(diff_line.old_line).to eq(subject.old_line)
         expect(diff_line.text).to eq("-    puts 'bar'")
       end
     end
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 0, subject.formatter.old_line)
+        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 0, subject.old_line)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
diff --git a/spec/lib/gitlab/diff/position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer_spec.rb
index 87c78cfe147..e5138705443 100644
--- a/spec/lib/gitlab/diff/position_tracer_spec.rb
+++ b/spec/lib/gitlab/diff/position_tracer_spec.rb
@@ -377,7 +377,7 @@ describe Gitlab::Diff::PositionTracer do
               it "returns the new position" do
                 expect_new_position(
                   new_path: old_position.new_path,
-                  new_line: old_position.formatter.new_line
+                  new_line: old_position.new_line
                 )
               end
             end
@@ -401,7 +401,7 @@ describe Gitlab::Diff::PositionTracer do
                 it "returns the new position" do
                   expect_new_position(
                     new_path: old_position.new_path,
-                    new_line: old_position.formatter.new_line
+                    new_line: old_position.new_line
                   )
                 end
               end
@@ -504,7 +504,7 @@ describe Gitlab::Diff::PositionTracer do
               it "returns the new position" do
                 expect_new_position(
                   new_path: old_position.new_path,
-                  new_line: old_position.formatter.new_line
+                  new_line: old_position.new_line
                 )
               end
             end
@@ -529,7 +529,7 @@ describe Gitlab::Diff::PositionTracer do
                 it "returns the new position" do
                   expect_new_position(
                     new_path: old_position.new_path,
-                    new_line: old_position.formatter.new_line
+                    new_line: old_position.new_line
                   )
                 end
               end
@@ -661,8 +661,8 @@ describe Gitlab::Diff::PositionTracer do
                   expect_new_position(
                     old_path: file_name,
                     new_path: new_file_name,
-                    old_line: old_position.formatter.new_line,
-                    new_line: old_position.formatter.new_line
+                    old_line: old_position.new_line,
+                    new_line: old_position.new_line
                   )
                 end
               end
@@ -1012,7 +1012,7 @@ describe Gitlab::Diff::PositionTracer do
                 expect_new_position(
                   new_path: old_position.new_path,
                   old_line: nil,
-                  new_line: old_position.formatter.new_line
+                  new_line: old_position.new_line
                 )
               end
             end
@@ -1037,7 +1037,7 @@ describe Gitlab::Diff::PositionTracer do
                   expect_new_position(
                     new_path: old_position.new_path,
                     old_line: nil,
-                    new_line: old_position.formatter.new_line
+                    new_line: old_position.new_line
                   )
                 end
               end
@@ -1144,7 +1144,7 @@ describe Gitlab::Diff::PositionTracer do
                 expect_new_position(
                   new_path: old_position.new_path,
                   old_line: nil,
-                  new_line: old_position.formatter.new_line
+                  new_line: old_position.new_line
                 )
               end
             end
@@ -1169,7 +1169,7 @@ describe Gitlab::Diff::PositionTracer do
                   expect_new_position(
                     new_path: old_position.new_path,
                     old_line: nil,
-                    new_line: old_position.formatter.new_line
+                    new_line: old_position.new_line
                   )
                 end
               end
@@ -1251,7 +1251,7 @@ describe Gitlab::Diff::PositionTracer do
                   old_path: old_position.old_path,
                   new_path: old_position.new_path,
                   old_line: nil,
-                  new_line: old_position.formatter.new_line
+                  new_line: old_position.new_line
                 )
               end
             end
@@ -1362,7 +1362,7 @@ describe Gitlab::Diff::PositionTracer do
                 expect_new_position(
                   old_path: old_position.old_path,
                   new_path: old_position.new_path,
-                  old_line: old_position.formatter.old_line,
+                  old_line: old_position.old_line,
                   new_line: nil
                 )
               end