Refactor: accept a file path in preceding_declaration_line.

...but do not use it yet.

Author: myronmarston

lib/rspec/core/metadata_filter.rb

@@ -54,7 +54,7 @@ def location_filter_applies?(locations, metadata)
             line_num  = meta[:line_number]
 
             locations[file_path].any? do |filter_line_num|
-              line_num == RSpec.world.preceding_declaration_line(filter_line_num)
+              line_num == RSpec.world.preceding_declaration_line(file_path, filter_line_num)
             end
           end
         end

lib/rspec/core/world.rb

@@ -96,7 +96,7 @@ def all_examples
       # @api private
       #
       # Find line number of previous declaration.
-      def preceding_declaration_line(filter_line)
+      def preceding_declaration_line(_file_name, filter_line)
         declaration_line_numbers.sort.inject(nil) do |highest_prior_declaration_line, line|
           line <= filter_line ? line : highest_prior_declaration_line
         end

spec/rspec/core/metadata_filter_spec.rb

@@ -52,8 +52,8 @@ def filter_applies?(key, value, metadata)
           }}
 
           before do
-            expect(world).to receive(:preceding_declaration_line).at_least(:once) do |v|
-              preceeding_declaration_lines[v]
+            expect(world).to receive(:preceding_declaration_line).at_least(:once) do |_file_name, line_num|
+              preceeding_declaration_lines[line_num]
             end
           end
 

spec/rspec/core/world_spec.rb

@@ -91,27 +91,31 @@ module RSpec::Core
       let(:group_declaration_line) { group.metadata[:line_number] }
       let(:example_declaration_line) { group_declaration_line + 2 }
 
+      def preceding_declaration_line(line_num)
+        world.preceding_declaration_line(__FILE__, line_num)
+      end
+
       context "with one example" do
         before { world.register(group) }
 
         it "returns nil if no example or group precedes the line" do
-          expect(world.preceding_declaration_line(group_declaration_line - 1)).to be_nil
+          expect(preceding_declaration_line(group_declaration_line - 1)).to be_nil
         end
 
         it "returns the argument line number if a group starts on that line" do
-          expect(world.preceding_declaration_line(group_declaration_line)).to eq(group_declaration_line)
+          expect(preceding_declaration_line(group_declaration_line)).to eq(group_declaration_line)
         end
 
         it "returns the argument line number if an example starts on that line" do
-          expect(world.preceding_declaration_line(example_declaration_line)).to eq(example_declaration_line)
+          expect(preceding_declaration_line(example_declaration_line)).to eq(example_declaration_line)
         end
 
         it "returns line number of a group that immediately precedes the argument line" do
-          expect(world.preceding_declaration_line(group_declaration_line + 1)).to eq(group_declaration_line)
+          expect(preceding_declaration_line(group_declaration_line + 1)).to eq(group_declaration_line)
         end
 
         it "returns line number of an example that immediately precedes the argument line" do
-          expect(world.preceding_declaration_line(example_declaration_line + 1)).to eq(example_declaration_line)
+          expect(preceding_declaration_line(example_declaration_line + 1)).to eq(example_declaration_line)
         end
       end
 
@@ -124,7 +128,7 @@ module RSpec::Core
         end
 
         it 'return line number of group if a group start on that line' do
-          expect(world.preceding_declaration_line(second_group_declaration_line)).to eq(second_group_declaration_line)
+          expect(preceding_declaration_line(second_group_declaration_line)).to eq(second_group_declaration_line)
         end
       end
     end