Skip to content

Commit 53c8642

Browse files
author
jordanbreen28
committed
(CONT-792) - Correct Style/RedundantRegexpCharacterClass
1 parent 902cc7f commit 53c8642

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

.rubocop_todo.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,6 @@ Style/ClassAndModuleChildren:
160160
Exclude:
161161
- 'lib/puppet/util/postgresql_validator.rb'
162162

163-
# Offense count: 5
164-
# This cop supports unsafe autocorrection (--autocorrect-all).
165-
# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
166-
# SupportedStyles: predicate, comparison
167-
Style/NumericPredicate:
168-
Exclude:
169-
- 'spec/**/*'
170-
- 'lib/puppet/type/postgresql_psql.rb'
171-
172163
# Offense count: 2
173164
# Configuration parameters: AllowedMethods.
174165
# AllowedMethods: respond_to_missing?
@@ -177,12 +168,6 @@ Style/OptionalBooleanParameter:
177168
- 'lib/puppet/functions/postgresql/postgresql_password.rb'
178169
- 'lib/puppet/type/postgresql_psql.rb'
179170

180-
# Offense count: 16
181-
# This cop supports safe autocorrection (--autocorrect).
182-
Style/RedundantRegexpCharacterClass:
183-
Exclude:
184-
- 'spec/defines/server/recovery_spec.rb'
185-
186171
# Offense count: 7
187172
# This cop supports safe autocorrection (--autocorrect).
188173
Style/RedundantRegexpEscape:

spec/defines/server/recovery_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class { 'postgresql::server': }
3030

3131
it do
3232
expect(subject).to contain_concat__fragment('test-recovery.conf')
33-
.with(content: %r{restore_command = 'restore_command'[\n]+recovery_target_timeline = 'recovery_target_timeline'})
33+
.with(content: %r{restore_command = 'restore_command'\n+recovery_target_timeline = 'recovery_target_timeline'})
3434
end
3535
end
3636

@@ -103,7 +103,7 @@ class { 'postgresql::server': }
103103

104104
it do
105105
expect(subject).to contain_concat__fragment('test-recovery.conf')
106-
.with(content: %r{restore_command = 'restore_command'[\n]+archive_cleanup_command = 'archive_cleanup_command'[\n]+recovery_end_command = 'recovery_end_command'[\n]+recovery_target_name = 'recovery_target_name'[\n]+recovery_target_time = 'recovery_target_time'[\n]+recovery_target_xid = 'recovery_target_xid'[\n]+recovery_target_inclusive = true[\n]+recovery_target = 'recovery_target'[\n]+recovery_target_timeline = 'recovery_target_timeline'[\n]+pause_at_recovery_target = true[\n]+standby_mode = on[\n]+primary_conninfo = 'primary_conninfo'[\n]+primary_slot_name = 'primary_slot_name'[\n]+trigger_file = 'trigger_file'[\n]+recovery_min_apply_delay = 0[\n]+}) # rubocop:disable Layout/LineLength
106+
.with(content: %r{restore_command = 'restore_command'\n+archive_cleanup_command = 'archive_cleanup_command'\n+recovery_end_command = 'recovery_end_command'\n+recovery_target_name = 'recovery_target_name'\n+recovery_target_time = 'recovery_target_time'\n+recovery_target_xid = 'recovery_target_xid'\n+recovery_target_inclusive = true\n+recovery_target = 'recovery_target'\n+recovery_target_timeline = 'recovery_target_timeline'\n+pause_at_recovery_target = true\n+standby_mode = on\n+primary_conninfo = 'primary_conninfo'\n+primary_slot_name = 'primary_slot_name'\n+trigger_file = 'trigger_file'\n+recovery_min_apply_delay = 0\n+}) # rubocop:disable Layout/LineLength
107107
end
108108
end
109109
end

0 commit comments

Comments
 (0)