Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

As each file is required in RSpec::Core::Configuration, push it onto requires. #3117

Merged
merged 2 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ Enhancements:
allways print a line number rather than an example id when the line number is ambiguous.
(Baden Ashford, #3085)

Bug fixes:

* `RSpec::Configuration#requires` will reflect files already required, whilst requiring
them. (Jon Rowe, #3117)

### 3.13.1 / 2024-09-02
[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.13.0...v3.13.1)

Expand Down
6 changes: 4 additions & 2 deletions lib/rspec/core/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1604,8 +1604,10 @@ def configure_example(example, example_hooks)
def requires=(paths)
directories = ['lib', default_path].select { |p| File.directory? p }
RSpec::Core::RubyProject.add_to_load_path(*directories)
paths.each { |path| load_file_handling_errors(:require, path) }
@requires += paths
paths.each { |path|
load_file_handling_errors(:require, path)
@requires << path
}
end

# @private
Expand Down
10 changes: 10 additions & 0 deletions spec/rspec/core/configuration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,16 @@ def absolute_path_to(dir)
expect(config.requires).to eq ['a/path']
end

it 'stores required paths "per file"' do
allow(config).to receive(:require).with('a/path')
expect(config).to receive(:require).with('another/path') do
expect(config.requires).to eq ['a/path']
end

config.requires = ['a/path', 'another/path']
expect(config.requires).to eq ['a/path', 'another/path']
end

context "when `default_path` refers to a file rather than a directory" do
it 'does not add it to the load path' do
config.default_path = 'Rakefile'
Expand Down
Loading