Skip to content

Commit

Permalink
Merge pull request #3117 from rspec/push_requires_into_config_as_requ…
Browse files Browse the repository at this point in the history
…ired

As each file is required in RSpec::Core::Configuration, push it onto `requires`.
  • Loading branch information
JonRowe committed Oct 10, 2024
1 parent d092c00 commit 55f9ead
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
5 changes: 5 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
### Development
[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.13.1...3-13-maintenance)

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 @@ -1597,8 +1597,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 @@ -238,6 +238,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

0 comments on commit 55f9ead

Please sign in to comment.