Skip to content

Commit 24e528b

Browse files
committed
Remove redundant config predicates
`fixture_path?` and `file_fixture_path?` were never used.
1 parent 5e0f3ca commit 24e528b

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

lib/rspec/rails/configuration.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ def self.initialize_configuration(config) # rubocop:disable Metrics/MethodLength
6767
config.add_setting :use_transactional_fixtures, alias_with: :use_transactional_examples
6868
config.add_setting :use_instantiated_fixtures
6969
config.add_setting :global_fixtures
70-
config.add_setting :fixture_path
70+
config.singleton_class.class_exec { attr_accessor :fixture_path }
71+
7172
config.include RSpec::Rails::FixtureSupport, :use_fixtures
7273

7374
# We'll need to create a deprecated module in order to properly report to
@@ -80,7 +81,8 @@ def self.initialize_configuration(config) # rubocop:disable Metrics/MethodLength
8081
config.include RSpec::Rails::FixtureSupport
8182

8283
if ::Rails::VERSION::STRING > '5'
83-
config.add_setting :file_fixture_path, default: 'spec/fixtures/files'
84+
config.singleton_class.class_eval { attr_accessor :file_fixture_path }
85+
config.file_fixture_path = 'spec/fixtures/files'
8486
config.include RSpec::Rails::FileFixtureSupport
8587
end
8688

spec/rspec/rails/configuration_spec.rb

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@
2323
opts ||= {}
2424
default_value = opts[:default]
2525
alias_setting = opts[:alias_with]
26+
skip_predicate = opts[:skip_predicate]
2627
query_method = accessor
2728
predicate_method = "#{accessor}?".to_sym
2829
command_method = "#{accessor}=".to_sym
2930

3031
specify "`##{query_method}` is `#{default_value.inspect}` by default" do
31-
expect(config.send(query_method)).to be(default_value)
32+
expect(config.send(query_method)).to eq(default_value)
3233
end
3334

34-
specify "`##{predicate_method}` is `#{!!default_value}` by default" do
35+
specify "`##{predicate_method}` is `#{!!default_value}` by default", unless: skip_predicate do
3536
expect(config.send(predicate_method)).to be(!!default_value)
3637
end
3738

@@ -71,9 +72,15 @@
7172

7273
include_examples "adds setting", :use_instantiated_fixtures
7374

75+
include_examples "adds setting", :use_active_record, default: true
76+
7477
include_examples "adds setting", :global_fixtures
7578

76-
include_examples "adds setting", :fixture_path
79+
include_examples "adds setting", :fixture_path, skip_predicate: true
80+
81+
include_examples "adds setting", :file_fixture_path,
82+
default: 'spec/fixtures/files',
83+
skip_predicate: true
7784

7885
include_examples "adds setting", :rendering_views
7986

0 commit comments

Comments
 (0)