Skip to content

Commit 146020c

Browse files
committed
remove deprecation warning for fixtures
1 parent 6734ed2 commit 146020c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

lib/rspec/rails/fixture_support.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ module FixtureSupport
2222
# /TODO
2323

2424
self.fixture_path = RSpec.configuration.fixture_path
25-
self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
25+
if ::Rails::VERSION::STRING > '5'
26+
self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
27+
else
28+
self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
29+
end
2630
self.use_instantiated_fixtures = RSpec.configuration.use_instantiated_fixtures
2731
fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
2832
end

spec/rspec/rails/configuration_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def in_inferring_type_from_location_environment
197197
it "metadata `:type => :request` sets up request example groups" do
198198
a_rails_app = double("Rails application")
199199
the_rails_module = double("Rails module", :application => a_rails_app)
200-
stub_const "Rails", the_rails_module
200+
stub_const "Rails", the_rails_module, :transfer_nested_constants => true
201201

202202
group = RSpec.describe("Some Request API", :type => :request)
203203

@@ -228,7 +228,7 @@ def in_inferring_type_from_location_environment
228228
it "metadata `:type => :feature` sets up feature example groups" do
229229
a_rails_app = double("Rails application")
230230
the_rails_module = double("Rails module", :application => a_rails_app)
231-
stub_const "Rails", the_rails_module
231+
stub_const "Rails", the_rails_module, :transfer_nested_constants => true
232232

233233
group = RSpec.describe("Some feature description", :type => :feature)
234234
example = group.new

0 commit comments

Comments
 (0)