Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
7 changes: 6 additions & 1 deletion lib/rspec/rails/fixture_support.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ def run_in_transaction?
if RSpec.configuration.use_active_record?
include Fixtures

self.fixture_path = RSpec.configuration.fixture_path
# TestFixtures#fixture_path is deprecated and will be removed in Rails 7.2
if respond_to?(:fixture_paths=)
fixture_paths << RSpec.configuration.fixture_path
else
self.fixture_path = RSpec.configuration.fixture_path
end
self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
self.use_instantiated_fixtures = RSpec.configuration.use_instantiated_fixtures

Expand Down
10 changes: 8 additions & 2 deletions spec/rspec/rails/configuration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,14 @@ def in_inferring_type_from_location_environment

group = RSpec.describe("Arbitrary Description", :use_fixtures)

expect(group).to respond_to(:fixture_path)
expect(group.fixture_path).to eq("custom/path")
if ::Rails::VERSION::MAJOR < 7
expect(group).to respond_to(:fixture_path)
expect(group.fixture_path).to eq("custom/path")
else
expect(group).to respond_to(:fixture_paths)
expect(group.fixture_paths).to include("custom/path")
end

expect(group.new.respond_to?(:foo, true)).to be(true)
end
end
Expand Down