Rename tracers as strategies57793-fix-line-age

It is a more appropriate word to be used for themgiven that
PositionTracer is still the interface to be used for position
tracing.

7 files changed, 16 insertions, 16 deletions

diff --git a/lib/gitlab/diff/position_tracer.rb b/lib/gitlab/diff/position_tracer.rb
index f36575adb9b..a1c82ce9afc 100644
--- a/lib/gitlab/diff/position_tracer.rb
+++ b/lib/gitlab/diff/position_tracer.rb
@@ -21,9 +21,9 @@ module Gitlab
         return unless old_diff_refs&.complete? && new_diff_refs&.complete?
         return unless old_position.diff_refs == old_diff_refs
 
-        tracer = old_position.on_text? ? LinePositionTracer : ImagePositionTracer
+        strategy = old_position.on_text? ? LineStrategy : ImageStrategy
 
-        tracer.new(self).trace(old_position)
+        strategy.new(self).trace(old_position)
       end
 
       def ac_diffs
diff --git a/lib/gitlab/diff/position_tracer/base.rb b/lib/gitlab/diff/position_tracer/base_strategy.rb
index c34cf395b2a..65049daabf4 100644
--- a/lib/gitlab/diff/position_tracer/base.rb
+++ b/lib/gitlab/diff/position_tracer/base_strategy.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module Diff
     class PositionTracer
-      class Base
+      class BaseStrategy
         attr_reader :tracer
 
         delegate \
diff --git a/lib/gitlab/diff/position_tracer/image_position_tracer.rb b/lib/gitlab/diff/position_tracer/image_strategy.rb
index 91f67429ca2..79244a17951 100644
--- a/lib/gitlab/diff/position_tracer/image_position_tracer.rb
+++ b/lib/gitlab/diff/position_tracer/image_strategy.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module Diff
     class PositionTracer
-      class ImagePositionTracer < Base
+      class ImageStrategy < BaseStrategy
         def trace(position)
           b_path = position.new_path
 
diff --git a/lib/gitlab/diff/position_tracer/line_position_tracer.rb b/lib/gitlab/diff/position_tracer/line_strategy.rb
index 8d93e0fcc06..8db0fc6f963 100644
--- a/lib/gitlab/diff/position_tracer/line_position_tracer.rb
+++ b/lib/gitlab/diff/position_tracer/line_strategy.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module Diff
     class PositionTracer
-      class LinePositionTracer < Base
+      class LineStrategy < BaseStrategy
         def trace(position)
           # Suppose we have an MR with source branch `feature` and target branch `master`.
           # When the MR was created, the head of `master` was commit A, and the
diff --git a/spec/lib/gitlab/diff/position_tracer/image_position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer/image_strategy_spec.rb
index 7f9bb6513fe..900816af53a 100644
--- a/spec/lib/gitlab/diff/position_tracer/image_position_tracer_spec.rb
+++ b/spec/lib/gitlab/diff/position_tracer/image_strategy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Diff::PositionTracer::ImagePositionTracer do
+describe Gitlab::Diff::PositionTracer::ImageStrategy do
   include PositionTracerHelpers
 
   let(:project) { create(:project, :repository) }
@@ -21,9 +21,9 @@ describe Gitlab::Diff::PositionTracer::ImagePositionTracer do
     )
   end
 
-  let(:position_tracer) { described_class.new(tracer) }
+  let(:strategy) { described_class.new(tracer) }
 
-  subject { position_tracer.trace(old_position) }
+  subject { strategy.trace(old_position) }
 
   let(:initial_commit) do
     project.commit(create_branch(branch_name, 'master')[:branch].name)
diff --git a/spec/lib/gitlab/diff/position_tracer/line_position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb
index 03910ab8bcb..7f4902c5b86 100644
--- a/spec/lib/gitlab/diff/position_tracer/line_position_tracer_spec.rb
+++ b/spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Diff::PositionTracer::LinePositionTracer do
+describe Gitlab::Diff::PositionTracer::LineStrategy do
   # Douwe's diary                                    New York City, 2016-06-28
   # --------------------------------------------------------------------------
   #
@@ -75,9 +75,9 @@ describe Gitlab::Diff::PositionTracer::LinePositionTracer do
     )
   end
 
-  let(:position_tracer) { described_class.new(tracer) }
+  let(:strategy) { described_class.new(tracer) }
 
-  subject { position_tracer.trace(old_position) }
+  subject { strategy.trace(old_position) }
 
   let(:initial_commit) do
     project.commit(create_branch(branch_name, 'master')[:branch].name)
@@ -1289,7 +1289,7 @@ describe Gitlab::Diff::PositionTracer::LinePositionTracer do
         end
 
         new_positions = old_positions.map do |old_position|
-          position_tracer.trace(old_position)
+          strategy.trace(old_position)
         end
 
         aggregate_failures do
diff --git a/spec/lib/gitlab/diff/position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer_spec.rb
index c891b2cdb0d..79b33d4d276 100644
--- a/spec/lib/gitlab/diff/position_tracer_spec.rb
+++ b/spec/lib/gitlab/diff/position_tracer_spec.rb
@@ -22,8 +22,8 @@ describe Gitlab::Diff::PositionTracer do
     context 'position is on text' do
       let(:on_text?) { true }
 
-      it 'calls LinePositionTracer#trace' do
-        expect(Gitlab::Diff::PositionTracer::LinePositionTracer)
+      it 'calls LineStrategy#trace' do
+        expect(Gitlab::Diff::PositionTracer::LineStrategy)
           .to receive(:new)
           .with(subject)
           .and_return(tracer)
@@ -36,8 +36,8 @@ describe Gitlab::Diff::PositionTracer do
     context 'position is not on text' do
       let(:on_text?) { false }
 
-      it 'calls ImagePositionTracer#trace' do
-        expect(Gitlab::Diff::PositionTracer::ImagePositionTracer)
+      it 'calls ImageStrategy#trace' do
+        expect(Gitlab::Diff::PositionTracer::ImageStrategy)
           .to receive(:new)
           .with(subject)
           .and_return(tracer)