Skip to content

Commit 6382468

Browse files
committed
WIP: Prepare appraisal files for view_component integration tests
* In order to write working integration tests for the major versions of ViewComponent that have instrumentation support, we need to use custom appraisal sets instead of `build_coverage_matrix`, since an ad-hoc Rails app needs to be spooled up, which includes `pg`, `rails`, and `sprockets < 4` for the max versions of Rails for `ViewComponent` `2.34.0 * I was not able to get the `docker compose` setup running on my machine due to the inability to pull the `ddapm-test-agent` * Therefore, I was not able to spool up containers for each version of Ruby to generate their `gemfiles/` * While I tested this locally with `ruby-3.3`, I did not commit the changes since I was not able to follow the containerized setup
1 parent b5bcb54 commit 6382468

16 files changed

+334
-14
lines changed

Matrixfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@
294294
'redis-3' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ✅ jruby',
295295
},
296296
'view_component' => {
297-
'view_component-min' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ✅ jruby',
298-
'view_component-3' => '❌ 2.5 / ❌ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ✅ jruby',
297+
'view_component-2.34.0' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ✅ jruby',
298+
'view_component-3.23.2' => '❌ 2.5 / ❌ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ✅ jruby',
299299
'view_component-4' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ❌ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ✅ jruby',
300300
},
301301
'appsec:active_record' => {

appraisal/jruby-9.2.rb

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
build_coverage_matrix('rest-client')
205205
build_coverage_matrix('mongo', min: '2.1.0')
206206
build_coverage_matrix('dalli', [2])
207-
build_coverage_matrix('view_component', (3..4), min: '2.34.0')
208207
# NOTE: JRuby bundler failed to install some dependencies https://github.com/ruby/psych/issues/700
209208
# and it could be re-enabled when upstream fix the issue
210209
# build_coverage_matrix('devise', min: '3.2.1')
@@ -271,6 +270,23 @@
271270
end
272271
end
273272

273+
appraise "view_component-2.34.0" do
274+
gem 'view_component', "~> 2.34.0", require: "view_component/engine"
275+
gem "actionview"
276+
gem "rails"
277+
gem 'pg'
278+
end
279+
280+
['3.23.2', '4'].each do |v|
281+
appraise "view_component-#{v}" do
282+
gem 'view_component', "~> #{v}"
283+
gem "actionview"
284+
gem "rails"
285+
gem 'sprockets', '< 4'
286+
gem 'pg'
287+
end
288+
end
289+
274290
appraise 'contrib-old' do
275291
gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
276292
end

appraisal/jruby-9.3.rb

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177
build_coverage_matrix('rest-client')
178178
build_coverage_matrix('mongo', min: '2.1.0')
179179
build_coverage_matrix('dalli', [2])
180-
build_coverage_matrix('view_component', (3..4), min: '2.34.0')
181180
# NOTE: JRuby bundler failed to install some dependencies https://github.com/ruby/psych/issues/700
182181
# and it could be re-enabled when upstream fix the issue
183182
# build_coverage_matrix('devise', min: '3.2.1')
@@ -244,6 +243,23 @@
244243
end
245244
end
246245

246+
appraise "view_component-2.34.0" do
247+
gem 'view_component', "~> 2.34.0", require: "view_component/engine"
248+
gem "actionview"
249+
gem "rails"
250+
gem 'sprockets', '< 4'
251+
gem 'pg'
252+
end
253+
254+
['3.23.2', '4'].each do |v|
255+
appraise "view_component-#{v}" do
256+
gem 'view_component', "~> #{v}"
257+
gem "actionview"
258+
gem "rails"
259+
gem 'pg'
260+
end
261+
end
262+
247263
appraise 'contrib-old' do
248264
gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
249265
end

appraisal/jruby-9.4.rb

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
build_coverage_matrix('mongo', min: '2.1.0')
8383
build_coverage_matrix('dalli', [2])
8484
build_coverage_matrix('karafka', min: '2.3.0')
85-
build_coverage_matrix('view_component', (3..4), min: '2.34.0')
8685

8786
appraise 'karafka-min' do
8887
gem 'karafka', '= 2.3.0'
@@ -156,6 +155,23 @@
156155
end
157156
end
158157

158+
appraise "view_component-2.34.0" do
159+
gem 'view_component', "~> 2.34.0", require: "view_component/engine"
160+
gem "actionview"
161+
gem "rails"
162+
gem 'sprockets', '< 4'
163+
gem 'pg'
164+
end
165+
166+
['3.23.2', '4'].each do |v|
167+
appraise "view_component-#{v}" do
168+
gem 'view_component', "~> #{v}"
169+
gem "actionview"
170+
gem "rails"
171+
gem 'pg'
172+
end
173+
end
174+
159175
appraise 'contrib-old' do
160176
gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
161177
end

appraisal/ruby-2.5.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@
224224
build_coverage_matrix('mongo', min: '2.1.0')
225225
build_coverage_matrix('dalli')
226226
build_coverage_matrix('devise', min: '3.2.1', meta: { min: { 'bigdecimal' => '1.3.4' } })
227-
build_coverage_matrix('view_component', min: '2.34.0')
228227

229228
appraise 'relational_db' do
230229
gem 'activerecord', '~> 5'
@@ -288,6 +287,14 @@
288287
end
289288
end
290289

290+
appraise "view_component-2.34.0" do
291+
gem 'view_component', "~> 2.34.0", require: "view_component/engine"
292+
gem "actionview"
293+
gem "rails"
294+
gem 'sprockets', '< 4'
295+
gem 'pg'
296+
end
297+
291298
appraise 'contrib-old' do
292299
gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
293300
end

appraisal/ruby-2.6.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177
build_coverage_matrix('mongo', min: '2.1.0')
178178
build_coverage_matrix('dalli', [2])
179179
build_coverage_matrix('devise', min: '3.2.1', meta: { min: { 'bigdecimal' => '1.4.1' } })
180-
build_coverage_matrix('view_component', min: '2.34.0')
181180

182181
appraise 'relational_db' do
183182
gem 'activerecord', '~> 6.0.0'
@@ -242,6 +241,14 @@
242241
end
243242
end
244243

244+
appraise "view_component-2.34.0" do
245+
gem 'view_component', "~> 2.34.0", require: "view_component/engine"
246+
gem "actionview"
247+
gem "rails"
248+
gem 'sprockets', '< 4'
249+
gem 'pg'
250+
end
251+
245252
appraise 'opentelemetry' do
246253
gem 'opentelemetry-sdk', '~> 1.1'
247254
end

appraisal/ruby-2.7.rb

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@
178178
build_coverage_matrix('mongo', min: '2.1.0')
179179
build_coverage_matrix('dalli', [2])
180180
build_coverage_matrix('devise', min: '3.2.1')
181-
build_coverage_matrix('view_component', [3], min: '2.34.0')
182181

183182
appraise 'relational_db' do
184183
gem 'activerecord', '~> 6.1.0'
@@ -245,6 +244,23 @@
245244
end
246245
end
247246

247+
appraise "view_component-2.34.0" do
248+
gem 'view_component', "~> 2.34.0", require: "view_component/engine"
249+
gem "actionview"
250+
gem "rails"
251+
gem 'sprockets', '< 4'
252+
gem 'pg'
253+
end
254+
255+
['3.23.2'].each do |v|
256+
appraise "view_component-#{v}" do
257+
gem 'view_component', "~> #{v}"
258+
gem "actionview"
259+
gem "rails"
260+
gem 'pg'
261+
end
262+
end
263+
248264
appraise 'opentelemetry' do
249265
gem 'opentelemetry-sdk', '~> 1.1'
250266
end

appraisal/ruby-3.0.rb

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
build_coverage_matrix('mongo', min: '2.1.0')
9999
build_coverage_matrix('dalli', [2])
100100
build_coverage_matrix('devise', min: '3.2.1')
101-
build_coverage_matrix('view_component', [3], min: '2.34.0')
102101

103102
appraise 'karafka-min' do
104103
gem 'karafka', '= 2.3.0'
@@ -169,6 +168,23 @@
169168
end
170169
end
171170

171+
appraise "view_component-2.34.0" do
172+
gem 'view_component', "~> 2.34.0", require: "view_component/engine"
173+
gem "actionview"
174+
gem "rails"
175+
gem 'sprockets', '< 4'
176+
gem 'pg'
177+
end
178+
179+
['3.23.2'].each do |v|
180+
appraise "view_component-#{v}" do
181+
gem 'view_component', "~> #{v}"
182+
gem "actionview"
183+
gem "rails"
184+
gem 'pg'
185+
end
186+
end
187+
172188
appraise 'opentelemetry' do
173189
gem 'opentelemetry-sdk', '~> 1.1'
174190
end

appraisal/ruby-3.1.rb

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
build_coverage_matrix('dalli', [2])
100100
build_coverage_matrix('karafka', min: '2.3.0')
101101
build_coverage_matrix('devise', min: '3.2.1')
102-
build_coverage_matrix('view_component', [3], min: '2.34.0')
103102

104103
appraise 'relational_db' do
105104
gem 'activerecord', '~> 7'
@@ -166,6 +165,23 @@
166165
end
167166
end
168167

168+
appraise "view_component-2.34.0" do
169+
gem 'view_component', "~> 2.34.0", require: "view_component/engine"
170+
gem "actionview"
171+
gem "rails"
172+
gem 'sprockets', '< 4'
173+
gem 'pg'
174+
end
175+
176+
['3.23.2'].each do |v|
177+
appraise "view_component-#{v}" do
178+
gem 'view_component', "~> #{v}"
179+
gem "actionview"
180+
gem "rails"
181+
gem 'pg'
182+
end
183+
end
184+
169185
appraise 'opentelemetry' do
170186
gem 'opentelemetry-sdk', '~> 1.1'
171187
end

appraisal/ruby-3.2.rb

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@
144144
build_coverage_matrix('dalli', [2])
145145
build_coverage_matrix('karafka', min: '2.3.0')
146146
build_coverage_matrix('devise', min: '3.2.1')
147-
build_coverage_matrix('view_component', (3..4), min: '2.34.0')
148147

149148
appraise 'relational_db' do
150149
gem 'activerecord', '~> 7'
@@ -211,6 +210,23 @@
211210
end
212211
end
213212

213+
appraise "view_component-2.34.0" do
214+
gem 'view_component', "~> 2.34.0", require: "view_component/engine"
215+
gem "actionview"
216+
gem "rails"
217+
gem 'sprockets', '< 4'
218+
gem 'pg'
219+
end
220+
221+
['3.23.2', '4'].each do |v|
222+
appraise "view_component-#{v}" do
223+
gem 'view_component', "~> #{v}"
224+
gem "actionview"
225+
gem "rails"
226+
gem 'pg'
227+
end
228+
end
229+
214230
appraise 'opentelemetry' do
215231
gem 'opentelemetry-sdk', '~> 1.1'
216232
end

0 commit comments

Comments
 (0)