File tree Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -67,7 +67,8 @@ def self.initialize_configuration(config) # rubocop:disable Metrics/MethodLength
67
67
config . add_setting :use_transactional_fixtures , alias_with : :use_transactional_examples
68
68
config . add_setting :use_instantiated_fixtures
69
69
config . add_setting :global_fixtures
70
- config . add_setting :fixture_path
70
+ config . singleton_class . class_exec { attr_accessor :fixture_path }
71
+
71
72
config . include RSpec ::Rails ::FixtureSupport , :use_fixtures
72
73
73
74
# 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
80
81
config . include RSpec ::Rails ::FixtureSupport
81
82
82
83
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'
84
86
config . include RSpec ::Rails ::FileFixtureSupport
85
87
end
86
88
Original file line number Diff line number Diff line change 23
23
opts ||= { }
24
24
default_value = opts [ :default ]
25
25
alias_setting = opts [ :alias_with ]
26
+ skip_predicate = opts [ :skip_predicate ]
26
27
query_method = accessor
27
28
predicate_method = "#{ accessor } ?" . to_sym
28
29
command_method = "#{ accessor } =" . to_sym
29
30
30
31
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 )
32
33
end
33
34
34
- specify "`##{ predicate_method } ` is `#{ !!default_value } ` by default" do
35
+ specify "`##{ predicate_method } ` is `#{ !!default_value } ` by default" , unless : skip_predicate do
35
36
expect ( config . send ( predicate_method ) ) . to be ( !!default_value )
36
37
end
37
38
71
72
72
73
include_examples "adds setting" , :use_instantiated_fixtures
73
74
75
+ include_examples "adds setting" , :use_active_record , default : true
76
+
74
77
include_examples "adds setting" , :global_fixtures
75
78
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
77
84
78
85
include_examples "adds setting" , :rendering_views
79
86
You can’t perform that action at this time.
0 commit comments