Skip to content

Commit 2b067fe

Browse files
committed
Fix RSpec 4 build: trigger_inclusion changes
See rubocop/rubocop#10806 and rspec/rspec-core#2878 for details
1 parent 3ba9393 commit 2b067fe

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

spec/rubocop/cop/rspec_rails/timecop_spec.rb

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
# frozen_string_literal: true
22

33
RSpec.describe RuboCop::Cop::RSpecRails::Timecop, :config do
4-
shared_context 'with Rails 5.1', :rails51 do
4+
shared_context 'with Rails 5.1' do
55
let(:rails_version) { 5.1 }
66
end
77

8-
shared_context 'with Rails 5.2', :rails52 do
8+
shared_context 'with Rails 5.2' do
99
let(:rails_version) { 5.2 }
1010
end
1111

12-
shared_context 'with Rails 6.0', :rails60 do
12+
shared_context 'with Rails 6.0' do
1313
let(:rails_version) { 6.0 }
1414
end
1515

16-
shared_context 'with Rails 7.0', :rails70 do
16+
shared_context 'with Rails 6.1' do
17+
let(:rails_version) { 6.1 }
18+
end
19+
20+
shared_context 'with Rails 7.0' do
1721
let(:rails_version) { 7.0 }
1822
end
1923

@@ -102,12 +106,14 @@
102106
end
103107
end
104108

105-
context 'when Rails < 5.2', :rails51 do
109+
context 'when Rails < 5.2' do
110+
include_context 'with Rails 5.1'
106111
include_examples 'flags and corrects to',
107112
replacement: 'travel_to(Time.now)'
108113
end
109114

110-
context 'with Rails 5.2+', :rails52 do
115+
context 'with Rails 5.2+' do
116+
include_context 'with Rails 5.2'
111117
include_examples 'flags and corrects to',
112118
replacement: 'freeze_time'
113119
end
@@ -134,7 +140,8 @@
134140
end
135141

136142
describe '.return' do
137-
context 'with Rails < 6.1', :rails60 do
143+
context 'with Rails < 6.1' do
144+
include_context 'with Rails 6.0'
138145
include_examples 'return prefers'
139146

140147
it 'flags, but does not correct return with a block' do
@@ -147,7 +154,8 @@
147154
end
148155
end
149156

150-
context 'with Rails 6.1+', :rails61 do
157+
context 'with Rails 6.1+' do
158+
include_context 'with Rails 6.1'
151159
include_examples 'return prefers'
152160

153161
it 'flags, and corrects return with a block' do

0 commit comments

Comments
 (0)