Ensure derived values are updated when the config setting updates.

It’s easier to make this work by moving the
`spec_files_with_failures` and the
`last_run_statuses` methods off of `world`
and over to `configuration.

Author: myronmarston

lib/rspec/core/configuration.rb

@@ -154,10 +154,22 @@ def deprecation_stream=(value)
         end
       end
 
-      # @macro add_setting
-      # Sets a file path to use for persisting example statuses. Necessary for the
+      # @macro define_reader
+      # The file path to use for persisting example statuses. Necessary for the
+      # `--only-failures` and `--next-failures` CLI options.
+      #
+      # @overload example_status_persistence_file_path
+      #   @return [String] the file path
+      # @overload example_status_persistence_file_path=(value)
+      #   @param value [String] the file path
+      define_reader :example_status_persistence_file_path
+
+      # Sets the file path to use for persisting example statuses. Necessary for the
       # `--only-failures` and `--next-failures` CLI options.
-      add_setting :example_status_persistence_file_path
+      def example_status_persistence_file_path=(value)
+        @example_status_persistence_file_path = value
+        clear_values_derived_from_example_status_persistence_file_path
+      end
 
       # @macro define_reader
       # Indicates if the `--only-failures` (or `--next-failure`) flag is being used.
@@ -353,6 +365,10 @@ def initialize
       def force(hash)
         ordering_manager.force(hash)
         @preferred_options.merge!(hash)
+
+        if hash.key?(:example_status_persistence_file_path)
+          clear_values_derived_from_example_status_persistence_file_path
+        end
       end
 
       # @private
@@ -820,14 +836,37 @@ def files_or_directories_to_run=(*files)
       def files_to_run
         @files_to_run ||= begin
           if @files_or_directories_to_run_defaulted && only_failures?
-            files_with_failures = RSpec.world.spec_files_with_failures.to_a
+            files_with_failures = spec_files_with_failures.to_a
             @files_or_directories_to_run = files_with_failures if files_with_failures.any?
           end
 
           get_files_to_run(@files_or_directories_to_run)
         end
       end
 
+      # @private
+      def last_run_statuses
+        @last_run_statuses ||= if (path = example_status_persistence_file_path)
+          ExampleStatusPersister.load_from(path).inject({}) do |hash, example|
+            hash[example.fetch(:example_id)] = example.fetch(:status)
+            hash
+          end
+        else
+          {}
+        end
+      end
+
+      # @private
+      FAILED_STATUS = "failed".freeze
+
+      # @private
+      def spec_files_with_failures
+        @spec_files_with_failures ||= last_run_statuses.inject(Set.new) do |files, (id, status)|
+          files << id.split(ON_SQUARE_BRACKETS).first if status == FAILED_STATUS
+          files
+        end.to_a
+      end
+
       # Creates a method that delegates to `example` including the submitted
       # `args`. Used internally to add variants of `example` like `pending`:
       # @param name [String] example name alias
@@ -1703,6 +1742,11 @@ def update_pattern_attr(name, value)
         instance_variable_set(:"@#{name}", value)
         @files_to_run = nil
       end
+
+      def clear_values_derived_from_example_status_persistence_file_path
+        @last_run_statuses = nil
+        @spec_files_with_failures = nil
+      end
     end
     # rubocop:enable Style/ClassLength
   end

lib/rspec/core/example.rb

@@ -163,7 +163,7 @@ def initialize(example_group_class, description, user_metadata, example_block=ni
         # This should perhaps be done in `Metadata::ExampleHash.create`,
         # but the logic there has no knowledge of `RSpec.world` and we
         # want to keep it that way. It's easier to just assign it here.
-        @metadata[:last_run_status] = RSpec.world.last_run_statuses[id]
+        @metadata[:last_run_status] = RSpec.configuration.last_run_statuses[id]
 
         @example_group_instance = @exception = nil
         @clock = RSpec::Core::Time

lib/rspec/core/world.rb

@@ -108,31 +108,6 @@ def reporter
         @configuration.reporter
       end
 
-      # @private
-      def last_run_statuses
-        @last_run_statuses ||=
-          if (path = @configuration.example_status_persistence_file_path)
-            ExampleStatusPersister.load_from(path).inject({}) do |hash, example|
-              hash[example.fetch(:example_id)] = example.fetch(:status)
-              hash
-            end
-          else
-            {}
-          end
-      end
-
-      # @private
-      def spec_files_with_failures
-        @spec_files_with_failures ||=
-          last_run_statuses.inject(Set.new) do |files, (id, status)|
-            files << id.split(Configuration::ON_SQUARE_BRACKETS).first if status == FAILED_STATUS
-            files
-          end.to_a
-      end
-
-      # @private
-      FAILED_STATUS = "failed".freeze
-
       # @api private
       #
       # Notify reporter of filters.

spec/rspec/core/configuration/only_failures_support_spec.rb

@@ -1,7 +1,6 @@
 module RSpec::Core
   RSpec.describe Configuration, "--only-failures support" do
     let(:config) { Configuration.new }
-    let(:world)  { World.new(config) }
 
     def simulate_persisted_examples(*examples)
       config.example_status_persistence_file_path = "examples.txt"
@@ -12,25 +11,31 @@ def simulate_persisted_examples(*examples)
 
     describe "#last_run_statuses" do
       def last_run_statuses
-        world.last_run_statuses
+        config.last_run_statuses
       end
 
       context "when `example_status_persistence_file_path` is configured" do
-        it 'gets the last run statuses from the ExampleStatusPersister' do
+        before do
           simulate_persisted_examples(
             { :example_id => "id_1", :status => "passed" },
             { :example_id => "id_2", :status => "failed" }
           )
+        end
 
+        it 'gets the last run statuses from the ExampleStatusPersister' do
           expect(last_run_statuses).to eq(
             'id_1' => 'passed', 'id_2' => 'failed'
           )
         end
+
+        it 'returns a memoized value' do
+          expect(last_run_statuses).to be(last_run_statuses)
+        end
       end
 
       context "when `example_status_persistence_file_path` is not configured" do
         it 'returns a memoized value' do
-          expect(last_run_statuses).to be(world.last_run_statuses)
+          expect(last_run_statuses).to be(last_run_statuses)
         end
 
         it 'returns a blank hash without attempting to load the persisted statuses' do
@@ -42,11 +47,36 @@ def last_run_statuses
           expect(last_run_statuses).to eq({})
         end
       end
+
+      def allows_value_to_change_when_updated
+        simulate_persisted_examples(
+          { :example_id => "id_1", :status => "passed" },
+          { :example_id => "id_2", :status => "failed" }
+        )
+
+        config.example_status_persistence_file_path = nil
+
+        expect {
+          yield
+        }.to change { last_run_statuses }.to('id_1' => 'passed', 'id_2' => 'failed')
+      end
+
+      it 'allows the value to be updated when `example_status_persistence_file_path` is set after first access' do
+        allows_value_to_change_when_updated do
+          config.example_status_persistence_file_path = "examples.txt"
+        end
+      end
+
+      it 'allows the value to be updated when `example_status_persistence_file_path` is forced after first access' do
+        allows_value_to_change_when_updated do
+          config.force(:example_status_persistence_file_path => "examples.txt")
+        end
+      end
     end
 
     describe "#spec_files_with_failures" do
       def spec_files_with_failures
-        world.spec_files_with_failures
+        config.spec_files_with_failures
       end
 
       context "when `example_status_persistence_file_path` is configured" do
@@ -62,7 +92,7 @@ def spec_files_with_failures
 
           expect(spec_files_with_failures).to(
             be_an(Array) &
-            be(world.spec_files_with_failures) &
+            be(spec_files_with_failures) &
             contain_exactly("./spec_1.rb", "./spec_5.rb")
           )
         end
@@ -73,10 +103,32 @@ def spec_files_with_failures
           config.example_status_persistence_file_path = nil
 
           expect(spec_files_with_failures).to(
-            eq([]) & be(world.spec_files_with_failures)
+            eq([]) & be(spec_files_with_failures)
           )
         end
       end
+
+      def allows_value_to_change_when_updated
+        simulate_persisted_examples({ :example_id => "./spec_1.rb[1:1]", :status => "failed" })
+
+        config.example_status_persistence_file_path = nil
+
+        expect {
+          yield
+        }.to change { spec_files_with_failures }.to(["./spec_1.rb"])
+      end
+
+      it 'allows the value to be updated when `example_status_persistence_file_path` is set after first access' do
+        allows_value_to_change_when_updated do
+          config.example_status_persistence_file_path = "examples.txt"
+        end
+      end
+
+      it 'allows the value to be updated when `example_status_persistence_file_path` is forced after first access' do
+        allows_value_to_change_when_updated do
+          config.force(:example_status_persistence_file_path => "examples.txt")
+        end
+      end
     end
 
     describe "#files_to_run, when `only_failures` is set" do
@@ -93,7 +145,7 @@ def spec_files_with_failures
       before do
         expect(files_loaded_via_default_path).not_to eq(files_with_failures)
         config.default_path = default_path
-        allow(RSpec.world).to receive_messages(:spec_files_with_failures => files_with_failures)
+        allow(config).to receive_messages(:spec_files_with_failures => files_with_failures)
         config.force(:only_failures => true)
       end
 
@@ -104,7 +156,7 @@ def spec_files_with_failures
         end
 
         it 'loads the default path if there are no files with failures' do
-          allow(RSpec.world).to receive_messages(:spec_files_with_failures => [])
+          allow(config).to receive_messages(:spec_files_with_failures => [])
           config.files_or_directories_to_run = []
           expect(config.files_to_run).to eq(files_loaded_via_default_path)
         end

spec/rspec/core/metadata_spec.rb

@@ -169,14 +169,14 @@ def metadata_for(*args)
       end
 
       describe ":last_run_status" do
-        it 'assigns it by looking up world.last_run_statuses[id]' do
+        it 'assigns it by looking up configuration.last_run_statuses[id]' do
           looked_up_ids = []
           last_run_statuses = Hash.new do |hash, id|
             looked_up_ids << id
             "some_status"
           end
 
-          allow(RSpec.world).to receive(:last_run_statuses).and_return(last_run_statuses)
+          allow(RSpec.configuration).to receive(:last_run_statuses).and_return(last_run_statuses)
           example = RSpec.describe.example
 
           expect(example.metadata[:last_run_status]).to eq("some_status")