Skip to content

Commit cc30ae4

Browse files
JonRoweJonRowe
authored
Merge pull request #2360 from rspec/fix-3-9-maintenance-builds
Fix 3-9-maintenance CI failures
2 parents e5ba05e + 1dcff41 commit cc30ae4

File tree

11 files changed

+158
-255
lines changed

11 files changed

+158
-255
lines changed

‎.rubocop_rspec_base.yml

Lines changed: 0 additions & 183 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ LineLength:
6969
MethodLength:
7070
Max: 15
7171

72-
# Who cares what we call the argument for binary operator methods?
73-
BinaryOperatorParameterName:
74-
Enabled: false
75-
7672
PercentLiteralDelimiters:
7773
PreferredDelimiters:
7874
'%': () # double-quoted string
@@ -115,195 +111,16 @@ StringLiterals:
115111
Style/SpecialGlobalVars:
116112
Enabled: false
117113

118-
Style/TrailingCommaInLiteral:
119-
Enabled: false
120-
121-
Style/TrailingCommaInArguments:
122-
Enabled: false
123-
124114
TrivialAccessors:
125115
AllowDSLWriters: true
126116
AllowPredicates: true
127117
ExactNameMatch: true
128118

129-
Style/ParallelAssignment:
130-
Enabled: false
131-
132-
Layout/EmptyLineBetweenDefs:
133-
Enabled: false
134-
135-
Layout/FirstParameterIndentation:
136-
Enabled: false
137-
138-
Naming/ConstantName:
139-
Enabled: false
140-
141-
Style/ClassCheck:
142-
Enabled: false
143-
144-
Style/ConditionalAssignment:
145-
Enabled: false
146-
147-
Style/EmptyMethod:
148-
Enabled: false
149-
150-
Style/FormatStringToken:
151-
Enabled: false
152-
153119
Style/GuardClause:
154120
Enabled: false
155121

156-
Style/IdenticalConditionalBranches:
157-
Enabled: false
158-
159122
Style/IfUnlessModifier:
160123
Enabled: false
161124

162-
Style/IfUnlessModifierOfIfUnless:
163-
Enabled: false
164-
165-
Style/MethodMissing:
166-
Enabled: false
167-
168-
Style/MixinUsage:
169-
Enabled: false
170-
171-
Style/MultipleComparison:
172-
Enabled: false
173-
174-
Style/MutableConstant:
175-
Enabled: false
176-
177-
Style/NestedModifier:
178-
Enabled: false
179-
180-
Style/NestedParenthesizedCalls:
181-
Enabled: false
182-
183-
Style/NumericPredicate:
184-
Enabled: false
185-
186-
Style/RedundantParentheses:
187-
Enabled: false
188-
189-
Style/StringLiteralsInInterpolation:
190-
Enabled: false
191-
192125
Style/SymbolArray:
193126
Enabled: false
194-
195-
Style/SymbolProc:
196-
Enabled: false
197-
198-
Style/YodaCondition:
199-
Enabled: false
200-
201-
Style/ZeroLengthPredicate:
202-
Enabled: false
203-
204-
Layout/ClosingParenthesisIndentation:
205-
Enabled: false
206-
207-
Layout/ExtraSpacing:
208-
Enabled: false
209-
210-
Layout/MultilineMethodCallBraceLayout:
211-
Enabled: false
212-
213-
Layout/MultilineMethodCallIndentation:
214-
Enabled: false
215-
216-
Layout/MultilineOperationIndentation:
217-
Enabled: false
218-
219-
Layout/SpaceAroundBlockParameters:
220-
Enabled: false
221-
222-
Layout/SpaceAroundOperators:
223-
Enabled: false
224-
225-
Layout/SpaceBeforeComma:
226-
Enabled: false
227-
228-
Style/BlockDelimiters:
229-
Enabled: false
230-
231-
Style/EmptyCaseCondition:
232-
Enabled: false
233-
234-
Style/MultilineIfModifier:
235-
Enabled: false
236-
237-
Style/RescueStandardError:
238-
Enabled: false
239-
240-
Style/StderrPuts:
241-
Enabled: false
242-
243-
Style/TernaryParentheses:
244-
Enabled: false
245-
246-
# This could likely be enabled, but it had a false positive on rspec-mocks
247-
# (suggested change was not behaviour preserving) so I don't trust it.
248-
Performance/HashEachMethods:
249-
Enabled: false
250-
251-
Naming/HeredocDelimiterNaming:
252-
Enabled: false
253-
254-
Layout/EmptyLineAfterMagicComment:
255-
Enabled: false
256-
257-
Layout/IndentArray:
258-
Enabled: false
259-
260-
Layout/IndentAssignment:
261-
Enabled: false
262-
263-
Layout/IndentHeredoc:
264-
Enabled: false
265-
266-
Layout/SpaceInsidePercentLiteralDelimiters:
267-
Enabled: false
268-
269-
Style/EmptyElse:
270-
Enabled: false
271-
272-
Style/IfInsideElse:
273-
Enabled: false
274-
275-
Style/RedundantReturn:
276-
Enabled: false
277-
278-
Style/StructInheritance:
279-
Enabled: false
280-
281-
Naming/VariableNumber:
282-
Enabled: false
283-
284-
Layout/SpaceInsideStringInterpolation:
285-
Enabled: false
286-
287-
Style/DateTime:
288-
Enabled: false
289-
290-
Style/ParenthesesAroundCondition:
291-
Enabled: false
292-
293-
Layout/EmptyLinesAroundBlockBody:
294-
Enabled: false
295-
296-
Lint/ImplicitStringConcatenation:
297-
Enabled: false
298-
299-
Lint/NestedMethodDefinition:
300-
Enabled: false
301-
302-
Style/RegexpLiteral:
303-
Enabled: false
304-
305-
Style/TrailingUnderscoreVariable:
306-
Enabled: false
307-
308-
Layout/EmptyLinesAroundAccessModifier:
309-
Enabled: false

‎.travis.yml

Lines changed: 38 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -38,57 +38,61 @@ dist: trusty
3838
matrix:
3939
include:
4040
# Rails dev / 6 builds >= 2.4.4
41-
- rvm: 2.6.3
41+
- rvm: 2.6.6
4242
env: RAILS_VERSION=master
43-
- rvm: 2.5.3
43+
- rvm: 2.5.8
4444
env: RAILS_VERSION=master
45-
- rvm: 2.4.4
45+
- rvm: 2.4.10
4646
env: RAILS_VERSION=master
4747

4848
# Rails 5.2 builds >= 2.2.2
49-
- rvm: 2.6.3
49+
- rvm: 2.6.6
5050
env: RAILS_VERSION='~> 5.2.0'
51-
- rvm: 2.5.3
51+
- rvm: 2.5.8
5252
env: RAILS_VERSION='~> 5.2.0'
53-
- rvm: 2.4.4
53+
- rvm: 2.4.10
5454
env: RAILS_VERSION='~> 5.2.0'
55-
- rvm: 2.3.7
55+
- rvm: 2.3.8
5656
env: RAILS_VERSION='~> 5.2.0'
5757
- rvm: 2.2.10
58-
env: RAILS_VERSION='~> 5.2.0'
58+
# An incompatibility with Ruby 2.2 in Rails 5.2.4.0 (still not fixed 5.2.4.3)
59+
# prevents from testing against this combination. This bug is not in 5-2-stable:
60+
# lib/action_dispatch/request/session.rb:96: syntax error, unexpected '.'
61+
# id&.public_id
62+
env: RAILS_VERSION='5-2-stable'
5963

6064
# Rails 5.1 Builds >= 2.2.2
61-
- rvm: 2.6.3
65+
- rvm: 2.6.6
6266
env: RAILS_VERSION='~> 5.1.0'
63-
- rvm: 2.5.3
67+
- rvm: 2.5.8
6468
env: RAILS_VERSION='~> 5.1.0'
65-
- rvm: 2.4.4
69+
- rvm: 2.4.10
6670
env: RAILS_VERSION='~> 5.1.0'
67-
- rvm: 2.3.7
71+
- rvm: 2.3.8
6872
env: RAILS_VERSION='~> 5.1.0'
6973
- rvm: 2.2.10
7074
env: RAILS_VERSION='~> 5.1.0'
7175

7276
# Rails 5.0 Builds >= 2.2.2
73-
- rvm: 2.6.3
77+
- rvm: 2.6.6
7478
env: RAILS_VERSION='~> 5.0.0'
75-
- rvm: 2.5.3
79+
- rvm: 2.5.8
7680
env: RAILS_VERSION='~> 5.0.0'
77-
- rvm: 2.4.4
81+
- rvm: 2.4.10
7882
env: RAILS_VERSION='~> 5.0.0'
79-
- rvm: 2.3.7
83+
- rvm: 2.3.8
8084
env: RAILS_VERSION='~> 5.0.0'
8185
- rvm: 2.2.10
8286
env: RAILS_VERSION='~> 5.0.0'
8387

8488
# Rails 4.2 Builds >= 1.9.3
85-
- rvm: 2.4.4
89+
- rvm: 2.4.10
8690
env: RAILS_VERSION='~> 4.2.0'
87-
- rvm: 2.4.4
91+
- rvm: 2.4.10
8892
env: RAILS_VERSION=4-2-stable
89-
- rvm: 2.3.7
93+
- rvm: 2.3.8
9094
env: RAILS_VERSION='~> 4.2.0'
91-
- rvm: 2.3.7
95+
- rvm: 2.3.8
9296
env: RAILS_VERSION=4-2-stable
9397
- rvm: 2.2.10
9498
env: RAILS_VERSION='~> 4.2.0'
@@ -108,9 +112,9 @@ matrix:
108112
env: RAILS_VERSION=4-2-stable
109113

110114
# Rails 4.1 Builds >= 1.9.3, < 2.4
111-
- rvm: 2.3.7
115+
- rvm: 2.3.8
112116
env: RAILS_VERSION='~> 4.1.0'
113-
- rvm: 2.3.7
117+
- rvm: 2.3.8
114118
env: RAILS_VERSION=4-1-stable
115119
- rvm: 2.2.10
116120
env: RAILS_VERSION='~> 4.1.0'
@@ -130,9 +134,9 @@ matrix:
130134
env: RAILS_VERSION=4-1-stable
131135

132136
# Rails 4.0 Builds >= 1.8.11, < 2.4
133-
- rvm: 2.3.7
137+
- rvm: 2.3.8
134138
env: RAILS_VERSION='~> 4.0.4'
135-
- rvm: 2.3.7
139+
- rvm: 2.3.8
136140
env: RAILS_VERSION=4-0-stable
137141
- rvm: 2.2.10
138142
env: RAILS_VERSION='~> 4.0.4'
@@ -152,9 +156,9 @@ matrix:
152156
env: RAILS_VERSION=4-0-stable
153157

154158
# Rails 3.2 Builds < 2.4
155-
- rvm: 2.3.7
159+
- rvm: 2.3.8
156160
env: RAILS_VERSION='~> 3.2.17'
157-
- rvm: 2.3.7
161+
- rvm: 2.3.8
158162
env: RAILS_VERSION=3-2-stable
159163
- rvm: 2.2.10
160164
env: RAILS_VERSION='~> 3.2.17'
@@ -202,12 +206,17 @@ matrix:
202206
env: RAILS_VERSION='~> 3.0.20'
203207

204208
allow_failures:
205-
- rvm: 2.6.3
209+
- rvm: 2.6.6
206210
env: RAILS_VERSION=master
207-
- rvm: 2.5.3
211+
- rvm: 2.5.8
208212
env: RAILS_VERSION=master
209-
- rvm: 2.4.4
213+
- rvm: 2.4.10
210214
env: RAILS_VERSION=master
215+
- rvm: 2.2.10
216+
# An actual incompatibility of 5.2.4.0-5.2.4.3 forces to use `5-2-stable`,
217+
# but there's a minor difference in the generated tests that results in a
218+
# minor failure.
219+
env: RAILS_VERSION='5-2-stable'
211220
fast_finish: true
212221

213222
branches:

‎Gemfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ gem 'yard', '~> 0.9.24', :require => false
1111

1212
### deps for rdoc.info
1313
group :documentation do
14-
gem 'redcarpet'
15-
gem 'github-markup'
1614
if RUBY_VERSION > '2.0.0'
15+
gem 'redcarpet'
16+
gem 'github-markup'
1717
gem 'relish'
1818
end
1919
end
@@ -30,8 +30,10 @@ end
3030

3131
if RUBY_VERSION < '1.9'
3232
gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
33-
else
34-
gem 'ffi', '~> 1.9.25'
33+
elsif RUBY_VERSION < '2.0'
34+
gem 'ffi', '< 1.11.0' # ffi dropped Ruby 2.0 support in 1.11.0
35+
elsif RUBY_VERSION < '2.3'
36+
gem 'ffi', '< 1.13.0'
3537
end
3638

3739
if RUBY_VERSION >= '2.0.0'
@@ -80,8 +82,8 @@ if RUBY_VERSION <= '1.8.7'
8082
# cucumber and gherkin require rubyzip as a runtime dependency on 1.8.7
8183
# Only < 1.0 supports 1.8.7
8284
gem 'rubyzip', '< 1.0'
83-
else
84-
gem "rubyzip", '>= 1.2.2'
85+
elsif RUBY_VERSION < '2.4'
86+
gem 'rubyzip', '>= 1.2.2', '< 2.0.0'
8587
end
8688

8789
if RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.2.0'

0 commit comments

Comments
 (0)