Allow files_to_run to be used in spec_helper when loaded early via -r.

This changes it to be lazily rather than eagerly computed.
This is important to allow `pattern` to be set from a `spec_helper`
file loaded via `-r`.

Author: myronmarston

features/command_line/init.feature

@@ -22,14 +22,36 @@ Feature: --init option
     Given I have a brand new project with no files
       And I have run `rspec --init`
      When I accept the recommended settings by removing `=begin` and `=end` from `spec/spec_helper.rb`
-      And I create a spec file with the following content:
-        """
+      And I create "spec/addition_spec.rb" with the following content:
+        """ruby
         RSpec.describe "Addition" do
           it "works" do
             expect(1 + 1).to eq(2)
           end
         end
         """
-      And I run `rspec`
+      And I create "spec/subtraction_spec.rb" with the following content:
+        """ruby
+        RSpec.describe "Subtraction" do
+          it "works" do
+            expect(1 - 1).to eq(0)
+          end
+        end
+        """
+
+     When I run `rspec`
+     Then the examples should all pass
+      And the output should not contain:
+        """
+        Addition
+          works
+        """
+
+     When I run `rspec spec/addition_spec.rb`
      Then the examples should all pass
+      And the output should contain:
+        """
+        Addition
+          works
+        """
 

features/step_definitions/additional_cli_steps.rb

@@ -73,7 +73,7 @@
   end
 end
 
-When /^I create a spec file with the following content:$/ do |content|
-  write_file("spec/example_spec.rb", content)
+When /^I create "([^"]*)" with the following content:$/ do |file_name, content|
+  write_file(file_name, content)
 end
 

lib/rspec/core/configuration.rb

@@ -231,7 +231,7 @@ def treat_symbols_as_metadata_keys_with_true_values=(value)
       # @private
       add_setting :include_or_extend_modules
       # @private
-      add_setting :files_to_run
+      attr_writer :files_to_run
       # @private
       add_setting :expecting_with_rspec
       # @private
@@ -248,7 +248,7 @@ def initialize
         @expectation_frameworks = []
         @include_or_extend_modules = []
         @mock_framework = nil
-        @files_to_run = []
+        @files_or_directories_to_run = []
         @color = false
         @pattern = '**/*_spec.rb'
         @failure_exit_code = 1
@@ -620,7 +620,12 @@ def profile_examples
       def files_or_directories_to_run=(*files)
         files = files.flatten
         files << default_path if (command == 'rspec' || Runner.running_in_drb?) && default_path && files.empty?
-        self.files_to_run = get_files_to_run(files)
+        @files_or_directories_to_run = files
+        @files_to_run = nil
+      end
+
+      def files_to_run
+        @files_to_run ||= get_files_to_run(@files_or_directories_to_run)
       end
 
       # Creates a method that delegates to `example` including the submitted

lib/rspec/core/configuration_options.rb

@@ -52,17 +52,38 @@ def force?(key)
         !UNFORCED_OPTIONS.include?(key)
       end
 
-      def order(keys, *ordered)
-        ordered.reverse.each do |key|
+      def order(keys)
+        OPTIONS_ORDER.reverse.each do |key|
           keys.unshift(key) if keys.delete(key)
         end
         keys
       end
 
+      OPTIONS_ORDER = [
+        # load paths depend on nothing, but must be set before `requires`
+        # to support load-path-relative requires.
+        :libs,
+
+        # `files_or_directories_to_run` uses `default_path` so it must be
+        # set before it.
+        :default_path,
+
+        # must be set before `requires` to support checking `config.files_to_run`
+        # from within `spec_helper.rb` when a `-rspec_helper` option is used.
+        :files_or_directories_to_run,
+
+        # In general, we want to require the specified files as early as possible.
+        # The `--require` option is specifically intended to allow early requires.
+        # For later requires, they can just put the require in their spec files, but
+        # `--require` provides a unique opportunity for users to instruct RSpec to
+        # load an extension file early for maximum flexibility.
+        :requires
+      ]
+
       def process_options_into(config)
         opts = options.reject { |k, _| UNPROCESSABLE_OPTIONS.include? k }
 
-        order(opts.keys, :libs, :requires, :default_path, :pattern).each do |key|
+        order(opts.keys).each do |key|
           force?(key) ? config.force(key => opts[key]) : config.__send__("#{key}=", opts[key])
         end
       end

spec/rspec/core/configuration_options_spec.rb

@@ -29,12 +29,13 @@
       opts.configure(config)
     end
 
-    it "sends loads requires before loading specs" do
+    it "loads requires before loading specs" do
       opts = config_options_object(*%w[-rspec_helper])
-      config = double("config").as_null_object
+      config = RSpec::Core::Configuration.new
       expect(config).to receive(:requires=).ordered
-      expect(config).to receive(:files_or_directories_to_run=).ordered
+      expect(config).to receive(:get_files_to_run).ordered
       opts.configure(config)
+      config.files_to_run
     end
 
     it "sets up load path and requires before formatter" do
@@ -45,20 +46,38 @@
       opts.configure(config)
     end
 
-    it "sends default_path before files_or_directories_to_run" do
+    it "sets default_path before loading specs" do
       opts = config_options_object(*%w[--default_path spec])
-      config = double("config").as_null_object
+      config = RSpec::Core::Configuration.new
       expect(config).to receive(:force).with(:default_path => 'spec').ordered
+      expect(config).to receive(:get_files_to_run).ordered
+      opts.configure(config)
+      config.files_to_run
+    end
+
+    it "sets `files_or_directories_to_run` before `requires` so users can check `files_to_run` in a spec_helper loaded by `--require`" do
+      opts = config_options_object(*%w[--require spec_helper])
+      config = RSpec::Core::Configuration.new
       expect(config).to receive(:files_or_directories_to_run=).ordered
+      expect(config).to receive(:requires=).ordered
       opts.configure(config)
     end
 
-    it "sends pattern before files_or_directories_to_run" do
+    it "sets default_path before `files_or_directories_to_run` since it relies on it" do
+      opts = config_options_object(*%w[--default_path spec])
+      config = RSpec::Core::Configuration.new
+      expect(config).to receive(:force).with(:default_path => 'spec').ordered
+      expect(config).to receive(:files_or_directories_to_run=).ordered
+      opts.configure(config)
+    end
+
+    it "sets pattern before loading specs" do
       opts = config_options_object(*%w[--pattern **/*.spec])
-      config = double("config").as_null_object
+      config = RSpec::Core::Configuration.new
       expect(config).to receive(:force).with(:pattern => '**/*.spec').ordered
-      expect(config).to receive(:files_or_directories_to_run=).ordered
+      expect(config).to receive(:get_files_to_run).ordered
       opts.configure(config)
+      config.files_to_run
     end
 
     it "assigns inclusion_filter" do
@@ -300,11 +319,12 @@
 
   describe "default_path" do
     it "gets set before files_or_directories_to_run" do
-      config = double("config").as_null_object
+      config = RSpec::Core::Configuration.new
       expect(config).to receive(:force).with(:default_path => 'foo').ordered
-      expect(config).to receive(:files_or_directories_to_run=).ordered
+      expect(config).to receive(:get_files_to_run).ordered
       opts = config_options_object("--default_path", "foo")
       opts.configure(config)
+      config.files_to_run
     end
   end