diff --git a/CHANGELOG.md b/CHANGELOG.md index 11d7bd71..94a13961 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Master (Unreleased) +* Fix merging RSpec DSL configuration from third-party gems. ([@pirj][]) + ## 2.5.0 (2021-09-21) * Declare autocorrect as unsafe for `ExpectChange`. ([@francois-ferrandis][]) diff --git a/config/default.yml b/config/default.yml index 5f2dd7f9..1f3c5e94 100644 --- a/config/default.yml +++ b/config/default.yml @@ -5,7 +5,20 @@ RSpec: - "**/*_spec.rb" - "**/spec/**/*" Language: + inherit_mode: + merge: + - Expectations + - Helpers + - Hooks + - HookScopes + - Runners + - Subjects ExampleGroups: + inherit_mode: + merge: + - Regular + - Skipped + - Focused Regular: - describe - context @@ -20,6 +33,12 @@ RSpec: - fcontext - ffeature Examples: + inherit_mode: + merge: + - Regular + - Skipped + - Focused + - Pending Regular: - it - specify @@ -62,6 +81,10 @@ RSpec: - all - suite Includes: + inherit_mode: + merge: + - Examples + - Context Examples: - it_behaves_like - it_should_behave_like @@ -73,6 +96,10 @@ RSpec: - to_not - not_to SharedGroups: + inherit_mode: + merge: + - Examples + - Context Examples: - shared_examples - shared_examples_for